初次提交
This commit is contained in:
李玉东
parent
7aec4e04b8
commit
f4256509d4
|
|
@ -5,132 +5,13 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="af4c07b7-4ec6-4591-87e0-621479a360cc" name="更改" comment="初次提交">
|
||||
<change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/sqldialects.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/Global.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/Init.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/bean/ScenarioResource.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/config/WsEndpointConfig.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/RequestCmdInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/ResponseCmdInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/oauth2/CallBackController.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/power/bean/ActionInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/power/bean/AmmunitionInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/power/bean/Equipment.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/power/bean/EquipmentPart.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/power/bean/MaterialNumInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/power/bean/PersonStatisticInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/power/bean/PositionInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/power/bean/PowerBase.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/power/bean/SimpleUnitInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/power/bean/TeamPeoWeaInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/power/controller/PowerController.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/EquipInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/Group.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/GuidInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/Mount.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/PostInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/PowerTask.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/PowerUnion.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/RegulationsRule.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/Route.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/ScenarioData.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/Sensors.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/Task.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/TeamPeoWeaInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/Unit.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/bean/Weather.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/bean/UserInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/thread/HandleReceiveThread.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/thread/HandleSendThread.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/thread/SpringGlobalTaskManager.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/ws/WsServer.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/resources/sql/append.sql" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/test/java/com/hivekion/ApplicationTest.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/test/java/com/hivekion/JsonTest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/statistic/bean/PersonInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/statistic/bean/StatisticBean.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/statistic/bean/TeamInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/statistic/controller/StatisticController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/springbootmybatis.iml" beforeDir="false" afterPath="$PROJECT_DIR$/springbootmybatis.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/CodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/CodeGenerator.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/DemoApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/DemoApplication.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/BaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/BaseController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/FightPowerHierarchyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/FightPowerHierarchyController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/ScenarioController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/ScenarioController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/TblEntityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/TblEntityController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/TreeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/controller/TreeController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblAircraft.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblAircraft.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblAircraftVo/TblAircraftAddInputVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblAircraftVo/TblAircraftAddInputVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblComm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblComm.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblCommVo/TblCommAddInputVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblCommVo/TblCommAddInputVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblCommVo/TblCommModelVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblCommVo/TblCommModelVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblDataModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblDataModel.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblDataModelVo/TblDataModelModelVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblDataModelVo/TblDataModelModelVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblEntity.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblEntityVo/TblEntityModelVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblEntityVo/TblEntityModelVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblEntityVo/TblEntityUpdateNameVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblEntityVo/TblEntityUpdateNameVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblFacility.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblFacility.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblLaser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblLaser.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblLaserVo/TblLaserModelVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblLaserVo/TblLaserModelVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblMount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblMount.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblMountVo/TblMountAddInputVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblMountVo/TblMountAddInputVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblMountVo/TblMountModelVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/domain/TblMountVo/TblMountModelVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/entity/Fightpowerhierarchy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/entity/Fightpowerhierarchy.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/entity/Scenario.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/entity/Scenario.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/mapper/ScenarioMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/mapper/ScenarioMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/FightpowerhierarchyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/FightpowerhierarchyService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/ITblEntityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/ITblEntityService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/ScenarioService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/ScenarioService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/impl/FightpowerhierarchyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/impl/FightpowerhierarchyServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/impl/ScenarioServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/impl/ScenarioServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/impl/TblEntityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/baseData/service/impl/TblEntityServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/aspects/ControllerLogAspect.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/aspects/ControllerLogAspect.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/config/SwaggerConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/config/SwaggerConfig.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/config/WebSecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/config/WebSecurityConfig.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/BaseEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/BaseEntity.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/ResponseData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/ResponseData.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/TreeEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/TreeEntity.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/TreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/TreeNode.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/vo/UserInfoVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/entity/vo/UserInfoVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/enums/ResultCodeEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/enums/ResultCodeEnum.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/handler/MetaHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/handler/MetaHandler.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/response/ResponseResult.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/response/ResponseResult.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/scheduled/BackUpDataBaseManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/scheduled/BackUpDataBaseManager.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/common/scheduled/JobService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/common/scheduled/JobService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/dicData/domain/DicOperatorCountry.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/dicData/domain/DicOperatorCountry.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/controller/ScenarioHistoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/controller/ScenarioHistoryController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/service/IScenarioHistoryService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/scenario/service/IScenarioHistoryService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/controller/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/controller/SysUserController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/controller/UserLoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/controller/UserLoginController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysArea.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysArea.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysCsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysCsMenu.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysCsRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysCsRole.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysCsRoleMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysCsRoleMenu.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysCsUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysCsUser.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysCsUserRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysCsUserRole.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysDept.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysDept.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysDictData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysDictData.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysDictType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysDictType.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysMenu.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysOperationLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysOperationLog.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysRole.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysRolePermission.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysRolePermission.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysUser.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysUserRoles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/SysUserRoles.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/vo/SysCsUser/SysCsUserViewVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/vo/SysCsUser/SysCsUserViewVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/vo/sysuser/SysUserModelVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/vo/sysuser/SysUserModelVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/vo/sysuser/SysUserViewVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/domain/vo/sysuser/SysUserViewVo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/service/ISysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/service/ISysUserService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/service/impl/SysRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/service/impl/SysRoleServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/system/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/system/service/impl/SysUserServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/test/domain/ProjectInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/test/domain/ProjectInfo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/hivekion/unit/controller/UnitStationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/hivekion/unit/controller/UnitStationController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/tbl/ScenarioMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/tbl/ScenarioMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/test/com/hivekion/System/InitAdminUser.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/test/com/hivekion/System/main_test.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/mapper/tbl/UnitMaterialStationMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/tbl/UnitMaterialStationMapper.xml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -371,7 +252,9 @@
|
|||
<workItem from="1757293603104" duration="7511000" />
|
||||
<workItem from="1757379564655" duration="27531000" />
|
||||
<workItem from="1757466364570" duration="7473000" />
|
||||
<workItem from="1757551777310" duration="11097000" />
|
||||
<workItem from="1757551777310" duration="27165000" />
|
||||
<workItem from="1757646901779" duration="1536000" />
|
||||
<workItem from="1757745562472" duration="686000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="初次提交">
|
||||
<option name="closed" value="true" />
|
||||
|
|
@ -429,7 +312,15 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1754884616330</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="8" />
|
||||
<task id="LOCAL-00008" summary="初次提交">
|
||||
<option name="closed" value="true" />
|
||||
<created>1757572201371</created>
|
||||
<option name="number" value="00008" />
|
||||
<option name="presentableId" value="LOCAL-00008" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1757572201371</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="9" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
|
|
|
|||
10
pom.xml
10
pom.xml
|
|
@ -280,6 +280,16 @@
|
|||
<skipTests>true</skipTests>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.11.0</version>
|
||||
<configuration>
|
||||
<source>8</source>
|
||||
<target>8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
|
|||
20
src/main/java/com/hivekion/statistic/bean/PersonInfo.java
Normal file
20
src/main/java/com/hivekion/statistic/bean/PersonInfo.java
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
package com.hivekion.statistic.bean;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* [类的简要说明]
|
||||
* <p>
|
||||
* [详细描述，可选]
|
||||
* <p>
|
||||
*
|
||||
* @author LiDongYU
|
||||
* @since 2025/7/22
|
||||
*/
|
||||
@Data
|
||||
public class PersonInfo {
|
||||
private int total;
|
||||
private int current;
|
||||
private int death;
|
||||
private int injured;
|
||||
}
|
||||
18
src/main/java/com/hivekion/statistic/bean/StatisticBean.java
Normal file
18
src/main/java/com/hivekion/statistic/bean/StatisticBean.java
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
package com.hivekion.statistic.bean;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* [类的简要说明]
|
||||
* <p>
|
||||
* [详细描述，可选]
|
||||
* <p>
|
||||
*
|
||||
* @author LiDongYU
|
||||
* @since 2025/7/22
|
||||
*/
|
||||
@Data
|
||||
public class StatisticBean {
|
||||
private TeamInfo team = new TeamInfo();
|
||||
private PersonInfo person = new PersonInfo();
|
||||
}
|
||||
21
src/main/java/com/hivekion/statistic/bean/TeamInfo.java
Normal file
21
src/main/java/com/hivekion/statistic/bean/TeamInfo.java
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
package com.hivekion.statistic.bean;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* [类的简要说明]
|
||||
* <p>
|
||||
* [详细描述，可选]
|
||||
* <p>
|
||||
*
|
||||
* @author LiDongYU
|
||||
* @since 2025/7/22
|
||||
*/
|
||||
@Data
|
||||
public class TeamInfo {
|
||||
|
||||
private String teamName;
|
||||
private int type = 0;
|
||||
private String lng;
|
||||
private String lat;
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
package com.hivekion.statistic.controller;
|
||||
|
||||
import com.hivekion.common.entity.ResponseData;
|
||||
import com.hivekion.statistic.bean.StatisticBean;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* [类的简要说明]
|
||||
* <p>
|
||||
* [详细描述，可选]
|
||||
* <p>
|
||||
*
|
||||
* @author LiDongYU
|
||||
* @since 2025/7/22
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/statistic")
|
||||
public class StatisticController {
|
||||
@GetMapping("/info")
|
||||
//todo
|
||||
public ResponseData<StatisticBean> statistic(String resourceId) {
|
||||
|
||||
return ResponseData.success(new StatisticBean());
|
||||
}
|
||||
}
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
<mapper namespace="com.hivekion.unit.mapper.UnitMaterialStationMapper">
|
||||
<select id="selectMaterialByStationId" resultType="com.hivekion.unit.entity.UnitMaterialStation">
|
||||
SELECT t1.material_num as materialNum,
|
||||
t2.`name` as name
|
||||
FROM `tbl_unit_material_station` t1
|
||||
t2.name as name
|
||||
FROM tbl_unit_material_station t1
|
||||
LEFT JOIN tbl_unit_material t2
|
||||
on t1.material_id = t2.id
|
||||
where t1.station_id = #{stationId}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user