产学研软件测试需求修改

fiveep-controller/src/main/java/com/bizmatics/controller/web/AlarmPowerController.java

@@ -106,6 +106,8 @@ public class AlarmPowerController {
      * @param endTime 结束时间
      * @param current 页数
      * @param size 条数
+     * @param type 告警等级
+     * @param alarmType 告警类型
      * @return
      */
     @GetMapping("/alarmGradeList")
@@ -114,9 +116,10 @@ public class AlarmPowerController {
                                                             @RequestParam(required = false) Date endTime,
                                                             @RequestParam Integer current,
                                                             @RequestParam Integer size,
-                                                            @RequestParam(required = false) Integer type){
+                                                            @RequestParam(required = false) Integer type,
+                                                            @RequestParam(required = false) String alarmType){
 
-        return ApiResult.success(alarmPowerService.alarmGradeList(siteId,startTime,endTime,current,size,type));
+        return ApiResult.success(alarmPowerService.alarmGradeList(siteId,startTime,endTime,current,size,type,alarmType));
     }
 
     /**

fiveep-controller/src/main/java/com/bizmatics/controller/web/SiteController.java

@@ -55,11 +55,13 @@ public class SiteController {
      * 查看站点列表
      *
      * @param name 名称
+     * @param stationAreaId 台区id
      * @return
      */
     @GetMapping("list2")
-    public ApiResult<List<SiteTwo>> list2(@RequestParam(required = false) String name) {
-        return ApiResult.success(siteService.list2(name));
+    public ApiResult<List<SiteTwo>> list2(@RequestParam(required = false) String name,
+                                          @RequestParam(required = false) Integer stationAreaId) {
+        return ApiResult.success(siteService.list2(name,stationAreaId));
     }
 
     /**

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/AlarmPowerMapper.java

@@ -76,7 +76,8 @@ public interface AlarmPowerMapper extends CrudMapper<AlarmPower> {
                                @Param("startTime") Date startTime,
                                @Param("endTime") Date endTime,
                                @Param("grades") List<String> grades,
-                               @Param("gradeType") Integer gradeType);
+                               @Param("gradeType") Integer gradeType,
+                               @Param("alarmType") String alarmType);
 
     List<AlarmPower> getLoopStatusListMap(@Param("siteId") Integer siteId);
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/PlatformAreaMapper.java

@@ -33,4 +33,6 @@ public interface PlatformAreaMapper extends CrudMapper<PlatformArea> {
 
     List<SiteListVo> deviceList(@Param("stationAreaId") int stationAreaId);
 
+    List<PlatformAreaVo> selectOne(@Param("stationAreaId") int stationAreaId);
+
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SiteMapper.java

@@ -31,7 +31,8 @@ public interface SiteMapper extends CrudMapper<Site> {
                        @Param("tenantId") Integer tenantId);
 
     List<SiteTwo> list2(@Param("userId") Integer userId,
-                        @Param("name") String name);
+                        @Param("name") String name,
+                        @Param("stationAreaId") Integer stationAreaId);
 
 
     List<Device> getDeviceListOne(@Param("siteId") Integer siteId);

fiveep-persistence/src/main/resources/mapper/mysql/AlarmPowerMapper.xml

@@ -195,6 +195,9 @@
                     #{name}
                 </foreach>
             </if>
+            <if test="alarmType != null and alarmType != ''">
+                and ap.alarm_type LIKE CONCAT(CONCAT('%', #{alarmType}), '%')
+            </if>
         </where>
     </select>
 

fiveep-persistence/src/main/resources/mapper/mysql/PlatformAreaMapper.xml

@@ -114,4 +114,17 @@
         a.id
     </select>
 
+    <select id="selectOne" resultType="com.bizmatics.model.vo.PlatformAreaVo">
+        SELECT
+        a.*
+        FROM
+        platform_area AS a
+        <where>
+            a.enable = 1
+            <if test="stationAreaId != null and stationAreaId != 0">
+                AND a.id = #{stationAreaId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

fiveep-persistence/src/main/resources/mapper/mysql/SiteMapper.xml

@@ -112,6 +112,9 @@
             <if test="name != null and name != ''">
                 and s.site_name LIKE CONCAT(CONCAT('%', #{name}), '%')
             </if>
+            <if test="stationAreaId != null and stationAreaId != 0">
+                and s.station_area_id = #{stationAreaId}
+            </if>
         </where>) AS a
         LEFT JOIN device_status AS b ON a.id = b.site_id
         GROUP BY

fiveep-service/src/main/java/com/bizmatics/service/AlarmPowerService.java

@@ -61,9 +61,11 @@ public interface AlarmPowerService extends CrudService<AlarmPower> {
      * @param current
      * @param size
      * @param type
+     * @param alarmType
      * @return
      */
-    CommonPage<AlarmPower> alarmGradeList(Integer siteId,Date startTime,Date endTime,Integer current,Integer size,Integer type);
+    CommonPage<AlarmPower> alarmGradeList(Integer siteId,Date startTime,Date endTime,Integer current,Integer size,
+                                          Integer type,String alarmType);
 
 
     /**

fiveep-service/src/main/java/com/bizmatics/service/SiteService.java

@@ -38,9 +38,10 @@ public interface SiteService extends CrudService<Site> {
     /**
      * 查看站点列表
      * @param name
+     * @param stationAreaId
      * @return
      */
-    List<SiteTwo> list2(String name);
+    List<SiteTwo> list2(String name,Integer stationAreaId);
 
     /**
      * 查看站点列表

fiveep-service/src/main/java/com/bizmatics/service/impl/AlarmPowerServiceImpl.java

@@ -110,7 +110,8 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
     }
 
     @Override
-    public CommonPage<AlarmPower> alarmGradeList(Integer siteId, Date startTime, Date endTime, Integer current, Integer size, Integer type) {
+    public CommonPage<AlarmPower> alarmGradeList(Integer siteId, Date startTime, Date endTime, Integer current,
+                                                 Integer size, Integer type,String alarmType) {
         List<String> gradeList = null;
         //1级告警
         if (1 == type){
@@ -127,7 +128,7 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
         }
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
         Page<AlarmPower> page = new Page<>(current,size);
-        page = baseMapper.gradeList(page,userId,siteId,startTime,endTime,gradeList,type);
+        page = baseMapper.gradeList(page,userId,siteId,startTime,endTime,gradeList,type,alarmType);
         return ToCommonPage(page);
     }
 

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -8,8 +8,10 @@ import com.bizmatics.common.core.util.BeanMapperUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.*;
 import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.PlatformAreaVo;
 import com.bizmatics.persistence.mapper.AlarmPowerMapper;
 import com.bizmatics.persistence.mapper.DeviceMapper;
+import com.bizmatics.persistence.mapper.PlatformAreaMapper;
 import com.bizmatics.persistence.mapper.SiteMapper;
 import com.bizmatics.persistence.mapper.system.SysUserMapper;
 import com.bizmatics.service.*;
@@ -46,6 +48,8 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     private DeviceService deviceService;
     @Autowired
     private AlarmPowerMapper alarmPowerMapper;
+    @Autowired(required = false)
+    private PlatformAreaMapper platformAreaMapper;
     @Autowired
     private UserSiteService userSiteService;
     @Autowired
@@ -84,9 +88,9 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     }
 
     @Override
-    public List<SiteTwo> list2(String name) {
+    public List<SiteTwo> list2(String name,Integer stationAreaId) {
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
-        return baseMapper.list2(userId, name);
+        return baseMapper.list2(userId, name,stationAreaId);
     }
 
     @Override
@@ -125,9 +129,11 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
 //                    deviceLambdaQueryWrapper.eq(Device::getSiteId, site.getId());
 //                    List<Device> list = deviceService.list(deviceLambdaQueryWrapper);
                     List<Device> list = baseMapper.getDeviceListOne(site.getId());
+                    List<PlatformAreaVo> list1 = platformAreaMapper.selectOne(site.getStationAreaId());
                     Integer count = alarmPowerMapper.selectCount(null, site.getId(), null, null, null, null, 1);
                     SiteVO siteVO = enhanceSite(list, site, null);
                     siteVO.setAlarmPowerCount(count);
+                    siteVO.setStationAreaName(list1.get(0).getPlatformAreaName());
                     return siteVO;
                 })
                 .orElseThrow(() -> new BusinessException("站点信息不存在"));

fiveep-service/src/main/java/com/bizmatics/service/vo/SiteVO.java

@@ -103,5 +103,10 @@ public class SiteVO {
      */
     private String status;
 
+    /**
+     * 站点状态
+     */
+    private String stationAreaName;
+
     private List<String> deviceType;
 }

fiveep.ipr

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AntConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-  </component>
-  <component name="CodeStyleManager">
-    <option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="true" />
-    <option name="CODE_STYLE_SCHEME" value="" />
-  </component>
-  <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-    </wildcardResourcePatterns>
-  </component>
-  <component name="EntryPointsManager">
-    <entry_points />
-  </component>
-  <component name="ExportToHTMLSettings">
-    <option name="PRINT_LINE_NUMBERS" value="false" />
-    <option name="OPEN_IN_BROWSER" value="false" />
-    <option name="OUTPUT_DIRECTORY" />
-  </component>
-  <component name="ImportConfiguration">
-    <option name="VENDOR" />
-    <option name="RELEASE_TAG" />
-    <option name="LOG_MESSAGE" />
-    <option name="CHECKOUT_AFTER_IMPORT" value="true" />
-  </component>
-  <component name="InspectionProjectProfileManager">
-    <profile version="1.0">
-      <option name="myName" value="Project Default" />
-    </profile>
-    <version value="1.0" />
-  </component>
-  <component name="JUnitProjectSettings">
-    <option name="TEST_RUNNER" value="UI" />
-  </component>
-  <component name="JavacSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="DEPRECATION" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-    <option name="USE_GENERICS_COMPILER" value="false" />
-  </component>
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="false" />
-    <option name="OPTION_NAVIGATOR" value="false" />
-    <option name="OPTION_INDEX" value="false" />
-    <option name="OPTION_SEPARATE_INDEX" value="false" />
-    <option name="OPTION_USE_1_1" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="false" />
-    <option name="OPTION_DEPRECATED_LIST" value="false" />
-    <option name="OTHER_OPTIONS" />
-    <option name="HEAP_SIZE" />
-    <option name="OPEN_IN_BROWSER" value="false" />
-  </component>
-  <component name="JikesSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="DEPRECATION" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="GENERATE_MAKE_FILE_DEPENDENCIES" value="false" />
-    <option name="DO_FULL_DEPENDENCE_CHECK" value="false" />
-    <option name="IS_INCREMENTAL_MODE" value="false" />
-    <option name="IS_EMACS_ERRORS_MODE" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module filepath="$PROJECT_DIR$/fiveep.iml" />
-      <module filepath="$PROJECT_DIR$/fiveep-service/fiveep-service.iml" />
-      <module filepath="$PROJECT_DIR$/fiveep-model/fiveep-model.iml" />
-      <module filepath="$PROJECT_DIR$/fiveep-persistence/fiveep-persistence.iml" />
-      <module filepath="$PROJECT_DIR$/fiveep-controller/fiveep-controller.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" />
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

fiveep.iws

@@ -1,446 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <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>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="BRANCH:feature-management-2021-9-16" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-    </select>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="a29cbb71-d42d-449d-9ff0-42f54f931d12" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/fiveep.iws" beforeDir="false" afterPath="$PROJECT_DIR$/fiveep.iws" afterDir="false" />
-    </list>
-    <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="Commander">
-    <leftPanel view="Project" />
-    <rightPanel view="Project" />
-    <splitter proportion="0.5" />
-  </component>
-  <component name="Cvs2Configuration">
-    <option name="ON_FILE_ADDING" value="0" />
-    <option name="ON_FILE_REMOVING" value="0" />
-    <option name="PRUNE_EMPTY_DIRECTORIES" value="true" />
-    <option name="SHOW_UPDATE_OPTIONS" value="true" />
-    <option name="SHOW_ADD_OPTIONS" value="true" />
-    <option name="SHOW_REMOVE_OPTIONS" value="true" />
-    <option name="MERGING_MODE" value="0" />
-    <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" />
-    <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" />
-    <option name="RESET_STICKY" value="false" />
-    <option name="CREATE_NEW_DIRECTORIES" value="true" />
-    <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" />
-    <option name="PROCESS_UNKNOWN_FILES" value="false" />
-    <option name="PROCESS_DELETED_FILES" value="false" />
-    <option name="SHOW_EDIT_DIALOG" value="true" />
-    <option name="RESERVED_EDIT" value="false" />
-    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-    <option name="SHOW_CHECKOUT_OPTIONS" value="true" />
-    <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS">
-      <value>
-        <option name="BRANCH" value="" />
-        <option name="DATE" value="" />
-        <option name="USE_BRANCH" value="false" />
-        <option name="USE_DATE" value="false" />
-      </value>
-    </option>
-    <option name="UPDATE_DATE_OR_REVISION_SETTINGS">
-      <value>
-        <option name="BRANCH" value="" />
-        <option name="DATE" value="" />
-        <option name="USE_BRANCH" value="false" />
-        <option name="USE_DATE" value="false" />
-      </value>
-    </option>
-    <option name="SHOW_CHANGES_REVISION_SETTINGS">
-      <value>
-        <option name="BRANCH" value="" />
-        <option name="DATE" value="" />
-        <option name="USE_BRANCH" value="false" />
-        <option name="USE_DATE" value="false" />
-      </value>
-    </option>
-    <option name="SHOW_OUTPUT" value="false" />
-    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
-    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
-    <option name="ADD_WATCH_INDEX" value="0" />
-    <option name="REMOVE_WATCH_INDEX" value="0" />
-    <option name="UPDATE_KEYWORD_SUBSTITUTION" />
-    <option name="MAKE_NEW_FILES_READONLY" value="false" />
-    <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" />
-    <option name="TAG_AFTER_FILE_COMMIT" value="false" />
-    <option name="TAG_AFTER_FILE_COMMIT_NAME" value="" />
-    <option name="TAG_AFTER_PROJECT_COMMIT" value="false" />
-    <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" />
-    <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
-    <option name="SHOW_CHECKIN_OPTIONS" value="true" />
-    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="" />
-    <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
-    <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
-    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
-    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
-  </component>
-  <component name="DebuggerManager">
-    <line_breakpoints converted="true" />
-    <exception_breakpoints converted="true">
-      <breakpoint_any>
-        <option name="NOTIFY_CAUGHT" value="true" />
-        <option name="NOTIFY_UNCAUGHT" value="true" />
-        <option name="ENABLED" value="false" />
-        <option name="SUSPEND_VM" value="true" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CONDITION" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="LOG_MESSAGE" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INVERSE_CLASS_FILLTERS" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-      </breakpoint_any>
-    </exception_breakpoints>
-    <field_breakpoints converted="true" />
-    <method_breakpoints converted="true" />
-  </component>
-  <component name="DebuggerSettings">
-    <option name="TRACING_FILTERS_ENABLED" value="true" />
-    <option name="TOSTRING_CLASSES_ENABLED" value="false" />
-    <option name="VALUE_LOOKUP_DELAY" value="700" />
-    <option name="DEBUGGER_TRANSPORT" value="0" />
-    <option name="FORCE_CLASSIC_VM" value="true" />
-    <option name="HIDE_DEBUGGER_ON_PROCESS_TERMINATION" value="false" />
-    <option name="SKIP_SYNTHETIC_METHODS" value="true" />
-    <option name="SKIP_CONSTRUCTORS" value="false" />
-    <option name="STEP_THREAD_SUSPEND_POLICY" value="SuspendThread" />
-    <default_breakpoint_settings>
-      <option name="NOTIFY_CAUGHT" value="true" />
-      <option name="NOTIFY_UNCAUGHT" value="true" />
-      <option name="WATCH_MODIFICATION" value="true" />
-      <option name="WATCH_ACCESS" value="true" />
-      <option name="WATCH_ENTRY" value="true" />
-      <option name="WATCH_EXIT" value="true" />
-      <option name="ENABLED" value="true" />
-      <option name="SUSPEND_VM" value="true" />
-      <option name="COUNT_FILTER_ENABLED" value="false" />
-      <option name="COUNT_FILTER" value="0" />
-      <option name="CONDITION_ENABLED" value="false" />
-      <option name="CONDITION" />
-      <option name="LOG_ENABLED" value="false" />
-      <option name="LOG_EXPRESSION_ENABLED" value="false" />
-      <option name="LOG_MESSAGE" />
-      <option name="CLASS_FILTERS_ENABLED" value="false" />
-      <option name="INVERSE_CLASS_FILLTERS" value="false" />
-      <option name="SUSPEND_POLICY" value="SuspendAll" />
-    </default_breakpoint_settings>
-    <filter>
-      <option name="PATTERN" value="com.sun.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="java.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="javax.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="org.omg.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="sun.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="junit.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-  </component>
-  <component name="EjbViewSettings">
-    <EjbView showMembers="false" autoscrollToSource="false" />
-  </component>
-  <component name="ErrorTreeViewConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="HIDE_WARNINGS" value="false" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="GitRewordedCommitMessages">
-    <option name="commitMessagesMapping">
-      <RewordedCommitMessageMapping>
-        <option name="originalMessage" value="update config" />
-        <option name="rewordedMessage" value="update config" />
-      </RewordedCommitMessageMapping>
-    </option>
-    <option name="currentCommit" value="1" />
-    <option name="onto" value="fa1015a0efe1792605de5be1297d179cd470b713" />
-  </component>
-  <component name="HierarchyBrowserManager">
-    <option name="SHOW_PACKAGES" value="false" />
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="SORT_ALPHABETICALLY" value="false" />
-  </component>
-  <component name="InspectionManager">
-    <option name="AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="SPLITTER_PROPORTION" value="0.5" />
-    <profile name="Default" />
-  </component>
-  <component name="LvcsProjectConfiguration">
-    <option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
-    <option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
-    <option name="ADD_LABEL_ON_FILE_PACKAGE_COMPILATION" value="true" />
-    <option name="ADD_LABEL_ON_PROJECT_MAKE" value="true" />
-    <option name="ADD_LABEL_ON_RUNNING" value="true" />
-    <option name="ADD_LABEL_ON_DEBUGGING" value="true" />
-    <option name="ADD_LABEL_ON_UNIT_TEST_PASSED" value="true" />
-    <option name="ADD_LABEL_ON_UNIT_TEST_FAILED" value="true" />
-  </component>
-  <component name="PerforceConfiguration">
-    <option name="PORT" value="magic:1666" />
-    <option name="USER" value="" />
-    <option name="PASSWORD" value="" />
-    <option name="CLIENT" value="" />
-    <option name="TRACE" value="false" />
-    <option name="PERFORCE_STATUS" value="true" />
-    <option name="CHANGELIST_OPTION" value="false" />
-    <option name="SYSTEMROOT" value="" />
-    <option name="P4_EXECUTABLE" value="p4" />
-    <option name="SHOW_BRANCH_HISTORY" value="false" />
-    <option name="GENERATE_COMMENT" value="false" />
-    <option name="SYNC_OPTION" value="Sync" />
-    <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
-    <option name="SHOW_CHECKIN_OPTIONS" value="true" />
-    <option name="FORCE_NON_EMPTY_COMMENT" value="true" />
-    <option name="LAST_COMMIT_MESSAGE" value="" />
-    <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
-    <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
-    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
-    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
-  </component>
-  <component name="ProjectId" id="2ACKEgjg2zZZYVywrt1s9tSLLCW" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewSettings">
-    <navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
-    <view id="ProjectPane">
-      <expanded_node type="directory" url="file://$PROJECT_DIR$" />
-    </view>
-    <view id="SourcepathPane" />
-    <view id="ClasspathPane" />
-  </component>
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-  </component>
-  <component name="RunManager">
-    <configuration selected="false" default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="wholeProject" />
-      </option>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="StarteamConfiguration">
-    <option name="SERVER" value="" />
-    <option name="PORT" value="49201" />
-    <option name="USER" value="" />
-    <option name="PASSWORD" value="" />
-    <option name="PROJECT" value="" />
-    <option name="VIEW" value="" />
-    <option name="ALTERNATIVE_WORKING_PATH" value="" />
-    <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
-    <option name="SHOW_CHECKIN_OPTIONS" value="true" />
-    <option name="LAST_COMMIT_MESSAGE" value="" />
-    <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
-  </component>
-  <component name="StructureViewFactory">
-    <option name="SORT_MODE" value="0" />
-    <option name="GROUP_INHERITED" value="true" />
-    <option name="AUTOSCROLL_MODE" value="true" />
-    <option name="SHOW_FIELDS" value="true" />
-    <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
-    <option name="GROUP_GETTERS_AND_SETTERS" value="true" />
-    <option name="SHOW_INHERITED" value="false" />
-    <option name="HIDE_NOT_PUBLIC" value="false" />
-  </component>
-  <component name="SvnConfiguration">
-    <option name="USER" value="" />
-    <option name="PASSWORD" value="" />
-    <option name="AUTO_ADD_FILES" value="0" />
-    <option name="AUTO_DEL_FILES" value="0" />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="a29cbb71-d42d-449d-9ff0-42f54f931d12" name="Default Changelist" comment="" />
-      <created>1654508019118</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1654508019118</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="TodoView" selected-index="0">
-    <todo-panel id="selected-file">
-      <are-packages-shown value="false" />
-      <flatten-packages value="false" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <flatten-packages value="false" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="feature-management-2021-9-16" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VssConfiguration">
-    <CheckoutOptions>
-      <option name="COMMENT" value="" />
-      <option name="DO_NOT_GET_LATEST_VERSION" value="false" />
-      <option name="REPLACE_WRITABLE" value="false" />
-      <option name="RECURSIVE" value="false" />
-    </CheckoutOptions>
-    <CheckinOptions>
-      <option name="COMMENT" value="" />
-      <option name="KEEP_CHECKED_OUT" value="false" />
-      <option name="RECURSIVE" value="false" />
-    </CheckinOptions>
-    <AddOptions>
-      <option name="COMMENT" value="" />
-      <option name="STORE_ONLY_LATEST_VERSION" value="false" />
-      <option name="CHECK_OUT_IMMEDIATELY" value="false" />
-      <option name="FILE_TYPE" value="0" />
-    </AddOptions>
-    <UndocheckoutOptions>
-      <option name="MAKE_WRITABLE" value="false" />
-      <option name="REPLACE_LOCAL_COPY" value="0" />
-      <option name="RECURSIVE" value="false" />
-    </UndocheckoutOptions>
-    <DiffOptions>
-      <option name="IGNORE_WHITE_SPACE" value="false" />
-      <option name="IGNORE_CASE" value="false" />
-    </DiffOptions>
-    <GetOptions>
-      <option name="REPLACE_WRITABLE" value="0" />
-      <option name="MAKE_WRITABLE" value="false" />
-      <option name="RECURSIVE" value="false" />
-    </GetOptions>
-    <option name="CLIENT_PATH" value="" />
-    <option name="SRCSAFEINI_PATH" value="" />
-    <option name="USER_NAME" value="" />
-    <option name="PWD" value="" />
-    <option name="SHOW_CHECKOUT_OPTIONS" value="true" />
-    <option name="SHOW_ADD_OPTIONS" value="true" />
-    <option name="SHOW_UNDOCHECKOUT_OPTIONS" value="true" />
-    <option name="SHOW_DIFF_OPTIONS" value="true" />
-    <option name="SHOW_GET_OPTIONS" value="true" />
-    <option name="USE_EXTERNAL_DIFF" value="false" />
-    <option name="EXTERNAL_DIFF_PATH" value="" />
-    <option name="REUSE_LAST_COMMENT" value="false" />
-    <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
-    <option name="SHOW_CHECKIN_OPTIONS" value="true" />
-    <option name="LAST_COMMIT_MESSAGE" value="" />
-    <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
-  </component>
-  <component name="WebViewSettings">
-    <webview flattenPackages="false" showMembers="false" autoscrollToSource="false" />
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="839" y="449" key="Git.Rebase.Log.Action.NewCommitMessage.Dialog" timestamp="1654737002927">
-      <screen x="0" y="0" width="1920" height="1080" />
-    </state>
-    <state x="839" y="449" key="Git.Rebase.Log.Action.NewCommitMessage.Dialog/0.0.1920.1080@0.0.1920.1080" timestamp="1654737002927" />
-    <state x="661" y="295" width="598" height="490" key="find.popup" timestamp="1654483859318">
-      <screen x="0" y="0" width="1920" height="1080" />
-    </state>
-    <state x="661" y="295" width="598" height="490" key="find.popup/0.0.1920.1080@0.0.1920.1080" timestamp="1654483859318" />
-    <state x="625" y="241" width="670" height="676" key="search.everywhere.popup" timestamp="1654483865874">
-      <screen x="0" y="0" width="1920" height="1080" />
-    </state>
-    <state x="625" y="241" width="670" height="676" key="search.everywhere.popup/0.0.1920.1080@0.0.1920.1080" timestamp="1654483865874" />
-  </component>
-</project>