2026-4-30:
1.后端代码2次更新
This commit is contained in:
143
rc_autoplc_backend/.idea/workspace.xml
generated
143
rc_autoplc_backend/.idea/workspace.xml
generated
@@ -4,81 +4,21 @@
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="d0fd3201-c24b-42c5-bb37-4c67b6c0d2a1" name="Changes" comment="2026-4-30: 1.后端代码初始化">
|
||||
<change beforePath="$PROJECT_DIR$/.gitattributes" beforeDir="false" afterPath="$PROJECT_DIR$/.gitattributes" afterDir="false" />
|
||||
<list default="true" id="d0fd3201-c24b-42c5-bb37-4c67b6c0d2a1" name="Changes" comment="2026-4-30: 1.后端代码2次更新">
|
||||
<change afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/RecordDealController.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/RecordDeal.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/RecordDealMapper.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/RecordDealService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/RecordDealServiceImpl.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/RecordDealMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/HELP.md" beforeDir="false" afterPath="$PROJECT_DIR$/HELP.md" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/LICENSE" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/mvnw.cmd" beforeDir="false" afterPath="$PROJECT_DIR$/mvnw.cmd" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/.mvn/wrapper/maven-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/.mvn/wrapper/maven-wrapper.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/RcznAdminApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/RcznAdminApplication.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/config/CorsConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/config/CorsConfig.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/controller/ManageLogController.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/controller/RoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/controller/RoleController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/controller/UserController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/domain/ManageLog.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/domain/Permission.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/domain/Permission.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/mapper/ManageLogMapper.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/mapper/UserMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/mapper/UserMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/service/ManageLogService.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/service/UserRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/service/UserRoleService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/service/UserService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/service/impl/ManageLogServiceImpl.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/service/impl/UserRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/service/impl/UserRoleServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/java/com/rczn/system/service/impl/UserServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/resources/application.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/resources/mapper/ManageLogMapper.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-admin/src/main/resources/mapper/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-admin/src/main/resources/mapper/UserMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/.mvn/wrapper/maven-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/.mvn/wrapper/maven-wrapper.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/DevInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/DevInfoController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/DevParamController.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/DevParamController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/FlowInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/FlowInfoController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/GoodsFlowStatusController.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/GoodsFlowStatusController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/GoodsInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/GoodsInfoController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/StepInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/StepInfoController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/PlcController.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/controller/PlcController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/DevInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/DevInfo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/DevParam.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/DevParam.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/GoodsFlowStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/GoodsFlowStatus.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/GoodsInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/GoodsInfo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/IslandInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/IslandInfo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/IslandParam.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/IslandParam.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/StepInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/StepInfo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/DevInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/DevInfoMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/DevParamMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/DevParamMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/GoodsFlowStatusMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/GoodsFlowStatusMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/GoodsInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/GoodsInfoMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/IslandInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/IslandInfoMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/StepInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/mapper/StepInfoMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/DevInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/DevInfoService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/DevParamService.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/DevParamService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/GoodsFlowStatusService.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/GoodsFlowStatusService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/GoodsInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/GoodsInfoService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/IslandInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/IslandInfoService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/StepInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/StepInfoService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/DevInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/DevInfoServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/DevParamServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/DevParamServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/FlowInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/FlowInfoServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/GoodsFlowStatusServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/GoodsFlowStatusServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/GoodsInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/GoodsInfoServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/IslandInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/IslandInfoServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/StepInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/service/impl/StepInfoServiceImpl.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/application-autoplc.yml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/application-autoplc.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/DevInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/DevInfoMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/DevParamMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/DevParamMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/GoodsFlowStatusMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/GoodsFlowStatusMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/GoodsInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/GoodsInfoMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/IslandInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/IslandInfoMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/StepInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/StepInfoMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-common/.mvn/wrapper/maven-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-common/.mvn/wrapper/maven-wrapper.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-common/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-common/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-common/src/main/java/com/rczn/domain/BaseBean.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-common/src/main/java/com/rczn/domain/BaseBean.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-common/src/main/java/com/rczn/interceptors/LoginInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-common/src/main/java/com/rczn/interceptors/LoginInterceptor.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/RecordInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/java/com/rczn/rcznautoplc/domain/RecordInfo.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/RecordInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper/RecordInfoMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-common/src/main/java/com/rczn/utils/JwtUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-common/src/main/java/com/rczn/utils/JwtUtil.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/rczn-common/src/main/resources/application-common.yml" beforeDir="false" afterPath="$PROJECT_DIR$/rczn-common/src/main/resources/application-common.yml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -121,29 +61,29 @@
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"RequestMappingsPanelOrder0": "0",
|
||||
"RequestMappingsPanelOrder1": "1",
|
||||
"RequestMappingsPanelWidth0": "75",
|
||||
"RequestMappingsPanelWidth1": "75",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"last_opened_file_path": "D:/java-work/融创智能PLC后台系统/RCZN-bs-program/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"project.structure.last.edited": "SDKs",
|
||||
"project.structure.proportion": "0.0",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"settings.editor.selected.configurable": "ai.codegeex.plugin.settings.ApplicationConfigurable",
|
||||
"spring.configuration.checksum": "23e183287596c71f060f4e02bc43279b",
|
||||
"ts.external.directory.path": "D:\\JetBrains\\IntelliJ IDEA 2023.1.7\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"RequestMappingsPanelOrder0": "0",
|
||||
"RequestMappingsPanelOrder1": "1",
|
||||
"RequestMappingsPanelWidth0": "75",
|
||||
"RequestMappingsPanelWidth1": "75",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"last_opened_file_path": "D:/java-work/融创智能PLC后台系统/RCZN-bs-program/rc_autoplc_backend/rczn-autoplc/src/main/resources/com/rczn/rcznautoplc/mapper",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"project.structure.last.edited": "SDKs",
|
||||
"project.structure.proportion": "0.0",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"settings.editor.selected.configurable": "ai.codegeex.plugin.settings.ApplicationConfigurable",
|
||||
"spring.configuration.checksum": "23e183287596c71f060f4e02bc43279b",
|
||||
"ts.external.directory.path": "D:\\JetBrains\\IntelliJ IDEA 2023.1.7\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}]]></component>
|
||||
}</component>
|
||||
<component name="ReactorSettings">
|
||||
<option name="notificationShown" value="true" />
|
||||
</component>
|
||||
@@ -280,7 +220,11 @@
|
||||
<workItem from="1775538246002" duration="14583000" />
|
||||
<workItem from="1776302804897" duration="29985000" />
|
||||
<workItem from="1776997692867" duration="18517000" />
|
||||
<workItem from="1777532907631" duration="956000" />
|
||||
<workItem from="1777532907631" duration="10528000" />
|
||||
<workItem from="1778123644426" duration="5968000" />
|
||||
<workItem from="1778462813994" duration="9630000" />
|
||||
<workItem from="1778722944145" duration="4071000" />
|
||||
<workItem from="1779082114886" duration="4032000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="新曾业务bean和相关数据持久化,controller restful 接口">
|
||||
<option name="closed" value="true" />
|
||||
@@ -354,7 +298,15 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1777533044176</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="10" />
|
||||
<task id="LOCAL-00010" summary="2026-4-30: 1.后端代码2次更新">
|
||||
<option name="closed" value="true" />
|
||||
<created>1777533903758</created>
|
||||
<option name="number" value="00010" />
|
||||
<option name="presentableId" value="LOCAL-00010" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1777533903758</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="11" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
@@ -409,7 +361,8 @@
|
||||
<MESSAGE value="2026-4-20: 1.增加权限管理对应接口实现" />
|
||||
<MESSAGE value="2026-4-20: 1.测试TestCrc.java" />
|
||||
<MESSAGE value="2026-4-30: 1.后端代码初始化" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="2026-4-30: 1.后端代码初始化" />
|
||||
<MESSAGE value="2026-4-30: 1.后端代码2次更新" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="2026-4-30: 1.后端代码2次更新" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
|
||||
@@ -8,7 +8,10 @@ import com.rczn.rcznautoplc.domain.RecordInfo;
|
||||
import com.rczn.rcznautoplc.service.ManageLogService;
|
||||
import com.rczn.rcznautoplc.service.RecordInfoService;
|
||||
import com.rczn.system.domain.Permission;
|
||||
import com.rczn.system.domain.Role;
|
||||
import com.rczn.system.domain.User;
|
||||
import com.rczn.system.domain.UserRole;
|
||||
import com.rczn.system.service.UserRoleService;
|
||||
import com.rczn.system.service.UserService;
|
||||
import com.rczn.utils.JwtUtil;
|
||||
import com.rczn.utils.Md5Util;
|
||||
@@ -17,6 +20,7 @@ import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Parameters;
|
||||
import io.swagger.v3.oas.annotations.enums.ParameterIn;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.models.security.SecurityScheme;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -174,6 +178,8 @@ public class UserController {
|
||||
|
||||
@Autowired
|
||||
ManageLogService manageLogService;
|
||||
@Autowired
|
||||
UserRoleService userRoleService;
|
||||
|
||||
@PostMapping("/login")
|
||||
@Operation(summary = "用户登录接口",description = "根据用户名和密码登录,返回JWT Token")
|
||||
@@ -222,13 +228,23 @@ public class UserController {
|
||||
Map<String, Object> claims = new HashMap<>();
|
||||
claims.put("id", user.getId());
|
||||
claims.put("username", user.getUserName());
|
||||
//获取角色列表:
|
||||
List<UserRole> roles = userRoleService.selectByRoleId(user.getId().intValue());
|
||||
List<Integer> roleIdList = roles.stream().map(UserRole::getRoleId).collect(Collectors.toList());
|
||||
|
||||
//获取权限列表:
|
||||
List<Permission> permissions = userService.findUserPermissions(user.getId());
|
||||
List<String> permissionList = permissions.stream().map(Permission::getPermissionCode).collect(Collectors.toList());
|
||||
claims.put("permissions", permissionList);
|
||||
String jwtToken = JwtUtil.genToken(claims);
|
||||
|
||||
LoginRequest request = new LoginRequest();
|
||||
request.setToken(jwtToken);
|
||||
request.setPermissions(permissionList);
|
||||
request.setRoles(roleIdList);
|
||||
request.setUsername(username);
|
||||
|
||||
//密码正确,返回成功信息
|
||||
return Result.success(jwtToken);
|
||||
return Result.success(request);
|
||||
} else {
|
||||
//密码错误,返回错误信息
|
||||
return Result.error("密码错误!");
|
||||
@@ -236,4 +252,59 @@ public class UserController {
|
||||
}
|
||||
}
|
||||
|
||||
class LoginRequest {
|
||||
//用户名
|
||||
private String username;
|
||||
//token
|
||||
private String token;
|
||||
|
||||
//角色列表
|
||||
private List<Integer> roles;
|
||||
//权限列表
|
||||
private List<String> permissions;
|
||||
|
||||
public LoginRequest(String username, String token, List<Integer> roles, List<String> permissions) {
|
||||
this.username = username;
|
||||
this.token = token;
|
||||
this.roles = roles;
|
||||
this.permissions = permissions;
|
||||
}
|
||||
|
||||
public LoginRequest() {
|
||||
|
||||
}
|
||||
|
||||
public String getUsername() {
|
||||
return username;
|
||||
}
|
||||
|
||||
public void setUsername(String username) {
|
||||
this.username = username;
|
||||
}
|
||||
|
||||
public String getToken() {
|
||||
return token;
|
||||
}
|
||||
|
||||
public void setToken(String token) {
|
||||
this.token = token;
|
||||
}
|
||||
|
||||
public List<Integer> getRoles() {
|
||||
return roles;
|
||||
}
|
||||
|
||||
public void setRoles(List<Integer> roles) {
|
||||
this.roles = roles;
|
||||
}
|
||||
|
||||
public List<String> getPermissions() {
|
||||
return permissions;
|
||||
}
|
||||
|
||||
public void setPermissions(List<String> permissions) {
|
||||
this.permissions = permissions;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -333,5 +333,4 @@ public class PlcController {
|
||||
return Result.success(aBoolean);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
package com.rczn.rcznautoplc.controller;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.rczn.domain.Result;
|
||||
import com.rczn.rcznautoplc.domain.RecordDeal;
|
||||
import com.rczn.rcznautoplc.service.RecordDealService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.Parameters;
|
||||
import io.swagger.v3.oas.annotations.enums.ParameterIn;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/recordDeal")
|
||||
@Tag(name = "异常处理记录管理", description = "异常处理记录增删改查+分页接口")
|
||||
public class RecordDealController {
|
||||
|
||||
@Autowired
|
||||
private RecordDealService recordDealService;
|
||||
|
||||
@GetMapping(value = "/listPage", produces = MediaType.APPLICATION_JSON_VALUE)
|
||||
@Operation(summary = "分页查询异常处理记录", description = "支持异常名称、类型、关联异常ID查询")
|
||||
@Parameters({
|
||||
@Parameter(name = "pageNum", required = true, example = "1", in = ParameterIn.QUERY),
|
||||
@Parameter(name = "pageSize", required = true, example = "10", in = ParameterIn.QUERY),
|
||||
@Parameter(name = "recordId", description = "关联异常ID", required = false, in = ParameterIn.QUERY),
|
||||
@Parameter(name = "recordName", description = "异常名称(模糊)", required = false, in = ParameterIn.QUERY),
|
||||
@Parameter(name = "recordType", description = "类型 1设备2样品3操作", required = false, in = ParameterIn.QUERY)
|
||||
})
|
||||
public Result listPage(
|
||||
@RequestParam Integer pageNum,
|
||||
@RequestParam Integer pageSize,
|
||||
@RequestParam(required = false) Integer recordId,
|
||||
@RequestParam(required = false) String recordName,
|
||||
@RequestParam(required = false) Integer recordType) {
|
||||
RecordDeal param = new RecordDeal();
|
||||
param.setRecordId(recordId);
|
||||
param.setRecordName(recordName);
|
||||
param.setRecordType(recordType);
|
||||
PageInfo<RecordDeal> page = recordDealService.selectPage(pageNum, pageSize, param);
|
||||
return Result.success(page);
|
||||
}
|
||||
|
||||
@GetMapping("/listByRecordId/{recordId}")
|
||||
@Operation(summary = "根据异常ID查询处理记录")
|
||||
public Result listByRecordId(@PathVariable Integer recordId) {
|
||||
return Result.success(recordDealService.selectByRecordId(recordId));
|
||||
}
|
||||
|
||||
@GetMapping("/getById/{id}")
|
||||
@Operation(summary = "根据ID查询详情")
|
||||
public Result getById(@PathVariable Long id) {
|
||||
RecordDeal deal = recordDealService.selectById(id);
|
||||
return deal != null ? Result.success(deal) : Result.error("记录不存在");
|
||||
}
|
||||
|
||||
@PostMapping("/add")
|
||||
@Operation(summary = "新增异常处理记录")
|
||||
public Result add(@RequestBody RecordDeal recordDeal) {
|
||||
try {
|
||||
return Result.success(recordDealService.insert(recordDeal));
|
||||
} catch (IllegalArgumentException e) {
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "修改异常处理记录")
|
||||
public Result update(@RequestBody RecordDeal recordDeal) {
|
||||
try {
|
||||
return Result.success(recordDealService.update(recordDeal));
|
||||
} catch (IllegalArgumentException e) {
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@DeleteMapping("/del/{id}")
|
||||
@Operation(summary = "删除处理记录(逻辑删除)")
|
||||
public Result delete(@PathVariable Long id) {
|
||||
try {
|
||||
return Result.success(recordDealService.deleteById(id));
|
||||
} catch (IllegalArgumentException e) {
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,7 +29,7 @@ public class DevInfo extends BaseBean {
|
||||
|
||||
private String company;
|
||||
|
||||
private Integer status; // 0-空闲,1-运行,4-故障
|
||||
private Integer status; //1:在线空闲 0:离线 2:忙碌 5:故障
|
||||
|
||||
private Integer runModel;//0-手动模式,1-自动模式
|
||||
|
||||
|
||||
@@ -15,6 +15,9 @@ public class IslandInfo extends BaseBean {
|
||||
|
||||
private String islandLogo;
|
||||
|
||||
//1:在线空闲 0:离线 2:忙碌 5:故障
|
||||
private Integer status;
|
||||
|
||||
private String desc;
|
||||
|
||||
public IslandInfo() {
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
package com.rczn.rcznautoplc.domain;
|
||||
|
||||
import com.rczn.domain.BaseBean;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 异常处理记录表
|
||||
*/
|
||||
public class RecordDeal extends BaseBean {
|
||||
|
||||
private Integer recordId; // 异常记录表ID
|
||||
private String dealContent; // 处理内容
|
||||
private String recordName; // 异常名称
|
||||
private Integer recordType; // 异常类型 1-设备异常 2-样品异常 3-操作异常
|
||||
|
||||
public RecordDeal() {
|
||||
}
|
||||
|
||||
public RecordDeal(Long id, Long createId, LocalDateTime createTime, Long updateId, LocalDateTime updateTime,
|
||||
boolean delSign, String remark, Integer recordId, String dealContent,
|
||||
String recordName, Integer recordType) {
|
||||
super(id, createId, createTime, updateId, updateTime, delSign, remark);
|
||||
this.recordId = recordId;
|
||||
this.dealContent = dealContent;
|
||||
this.recordName = recordName;
|
||||
this.recordType = recordType;
|
||||
}
|
||||
|
||||
public Integer getRecordId() {
|
||||
return recordId;
|
||||
}
|
||||
|
||||
public void setRecordId(Integer recordId) {
|
||||
this.recordId = recordId;
|
||||
}
|
||||
|
||||
public String getDealContent() {
|
||||
return dealContent;
|
||||
}
|
||||
|
||||
public void setDealContent(String dealContent) {
|
||||
this.dealContent = dealContent;
|
||||
}
|
||||
|
||||
public String getRecordName() {
|
||||
return recordName;
|
||||
}
|
||||
|
||||
public void setRecordName(String recordName) {
|
||||
this.recordName = recordName;
|
||||
}
|
||||
|
||||
public Integer getRecordType() {
|
||||
return recordType;
|
||||
}
|
||||
|
||||
public void setRecordType(Integer recordType) {
|
||||
this.recordType = recordType;
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,11 @@ import com.rczn.domain.BaseBean;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
public class RecordInfo extends BaseBean {
|
||||
|
||||
private Integer islandId;//关联对应功能岛ID
|
||||
|
||||
private Integer devId;//关联对应设备ID
|
||||
|
||||
private String recordName;
|
||||
|
||||
private Integer recordType; // 1-设备异常,2-样品异常,3-操作异常
|
||||
@@ -16,8 +21,31 @@ public class RecordInfo extends BaseBean {
|
||||
public RecordInfo() {
|
||||
}
|
||||
|
||||
public RecordInfo(Long id, Long createId, LocalDateTime createTime, Long updateId, LocalDateTime updateTime, boolean delSign, String remark) {
|
||||
public RecordInfo(Long id, Long createId, LocalDateTime createTime, Long updateId, LocalDateTime updateTime, boolean delSign, String remark, Integer islandId, Integer devId,
|
||||
String recordName, Integer recordType, Boolean recordStatus, String recordContent) {
|
||||
super(id, createId, createTime, updateId, updateTime, delSign, remark);
|
||||
this.islandId = islandId;
|
||||
this.devId = devId;
|
||||
this.recordName = recordName;
|
||||
this.recordType = recordType;
|
||||
this.recordStatus = recordStatus;
|
||||
this.recordContent = recordContent;
|
||||
}
|
||||
|
||||
public Integer getIslandId() {
|
||||
return islandId;
|
||||
}
|
||||
|
||||
public void setIslandId(Integer islandId) {
|
||||
this.islandId = islandId;
|
||||
}
|
||||
|
||||
public Integer getDevId() {
|
||||
return devId;
|
||||
}
|
||||
|
||||
public void setDevId(Integer devId) {
|
||||
this.devId = devId;
|
||||
}
|
||||
|
||||
public String getRecordName() {
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.rczn.rcznautoplc.mapper;
|
||||
|
||||
import com.rczn.rcznautoplc.domain.RecordDeal;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface RecordDealMapper {
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*/
|
||||
Long insert(RecordDeal recordDeal);
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
Boolean update(RecordDeal recordDeal);
|
||||
|
||||
/**
|
||||
* 逻辑删除
|
||||
*/
|
||||
Boolean deleteById(@Param("id") Long id);
|
||||
|
||||
/**
|
||||
* 根据ID查询
|
||||
*/
|
||||
RecordDeal selectById(@Param("id") Long id);
|
||||
|
||||
/**
|
||||
* 分页条件查询
|
||||
*/
|
||||
List<RecordDeal> selectPage(RecordDeal recordDeal);
|
||||
|
||||
/**
|
||||
* 根据异常记录ID查询
|
||||
*/
|
||||
List<RecordDeal> selectByRecordId(@Param("recordId") Integer recordId);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.rczn.rcznautoplc.service;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.rczn.rcznautoplc.domain.RecordDeal;
|
||||
import java.util.List;
|
||||
|
||||
public interface RecordDealService {
|
||||
|
||||
PageInfo<RecordDeal> selectPage(Integer pageNum, Integer pageSize, RecordDeal recordDeal);
|
||||
|
||||
RecordDeal selectById(Long id);
|
||||
|
||||
List<RecordDeal> selectByRecordId(Integer recordId);
|
||||
|
||||
Long insert(RecordDeal recordDeal);
|
||||
|
||||
Boolean update(RecordDeal recordDeal);
|
||||
|
||||
Boolean deleteById(Long id);
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package com.rczn.rcznautoplc.service.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.rczn.rcznautoplc.domain.RecordDeal;
|
||||
import com.rczn.rcznautoplc.mapper.RecordDealMapper;
|
||||
import com.rczn.rcznautoplc.service.RecordDealService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class RecordDealServiceImpl implements RecordDealService {
|
||||
|
||||
@Autowired
|
||||
private RecordDealMapper recordDealMapper;
|
||||
|
||||
@Override
|
||||
public PageInfo<RecordDeal> selectPage(Integer pageNum, Integer pageSize, RecordDeal recordDeal) {
|
||||
PageHelper.startPage(pageNum, pageSize);
|
||||
List<RecordDeal> list = recordDealMapper.selectPage(recordDeal);
|
||||
return new PageInfo<>(list);
|
||||
}
|
||||
|
||||
@Override
|
||||
public RecordDeal selectById(Long id) {
|
||||
if (id == null) {
|
||||
throw new IllegalArgumentException("ID不能为空");
|
||||
}
|
||||
return recordDealMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<RecordDeal> selectByRecordId(Integer recordId) {
|
||||
if (recordId == null) {
|
||||
throw new IllegalArgumentException("异常记录ID不能为空");
|
||||
}
|
||||
return recordDealMapper.selectByRecordId(recordId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long insert(RecordDeal recordDeal) {
|
||||
if (recordDeal.getRecordId() == null) {
|
||||
throw new IllegalArgumentException("异常记录ID不能为空");
|
||||
}
|
||||
if (recordDeal.getDealContent() == null || recordDeal.getDealContent().trim().isEmpty()) {
|
||||
throw new IllegalArgumentException("处理内容不能为空");
|
||||
}
|
||||
return recordDealMapper.insert(recordDeal);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean update(RecordDeal recordDeal) {
|
||||
if (recordDeal.getId() == null) {
|
||||
throw new IllegalArgumentException("ID不能为空");
|
||||
}
|
||||
return recordDealMapper.update(recordDeal);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteById(Long id) {
|
||||
if (id == null) {
|
||||
throw new IllegalArgumentException("ID不能为空");
|
||||
}
|
||||
return recordDealMapper.deleteById(id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.rczn.rcznautoplc.mapper.RecordDealMapper">
|
||||
|
||||
<!-- 基础字段 -->
|
||||
<sql id="baseColumn">
|
||||
id, create_id, create_time, update_id, update_time, del_sign, remark
|
||||
</sql>
|
||||
|
||||
<!-- 业务字段 -->
|
||||
<sql id="dealColumn">
|
||||
record_id, deal_content, record_name, record_type
|
||||
</sql>
|
||||
|
||||
<!-- 新增 -->
|
||||
<insert id="insert" useGeneratedKeys="true" keyProperty="id">
|
||||
INSERT INTO tb_record_deal (
|
||||
<include refid="dealColumn"/>,
|
||||
create_id, create_time, update_id, update_time, del_sign
|
||||
) VALUES (
|
||||
#{recordId}, #{dealContent}, #{recordName}, #{recordType},
|
||||
#{createId}, NOW(), #{updateId}, NOW(), 0
|
||||
)
|
||||
</insert>
|
||||
|
||||
<!-- 修改 -->
|
||||
<update id="update">
|
||||
UPDATE tb_record_deal
|
||||
<set>
|
||||
<if test="recordId != null">record_id = #{recordId},</if>
|
||||
<if test="dealContent != null and dealContent != ''">deal_content = #{dealContent},</if>
|
||||
<if test="recordName != null and recordName != ''">record_name = #{recordName},</if>
|
||||
<if test="recordType != null">record_type = #{recordType},</if>
|
||||
<if test="updateId != null">update_id = #{updateId},</if>
|
||||
update_time = NOW()
|
||||
</set>
|
||||
WHERE id = #{id} AND del_sign = 0
|
||||
</update>
|
||||
|
||||
<!-- 逻辑删除 -->
|
||||
<update id="deleteById">
|
||||
UPDATE tb_record_deal
|
||||
SET del_sign = 1, update_time = NOW()
|
||||
WHERE id = #{id} AND del_sign = 0
|
||||
</update>
|
||||
|
||||
<!-- 根据ID查询 -->
|
||||
<select id="selectById" resultType="com.rczn.rcznautoplc.domain.RecordDeal">
|
||||
SELECT
|
||||
<include refid="baseColumn"/>,
|
||||
<include refid="dealColumn"/>
|
||||
FROM tb_record_deal
|
||||
WHERE id = #{id} AND del_sign = 0
|
||||
</select>
|
||||
|
||||
<!-- 分页查询 -->
|
||||
<select id="selectPage" resultType="com.rczn.rcznautoplc.domain.RecordDeal">
|
||||
SELECT
|
||||
<include refid="baseColumn"/>,
|
||||
<include refid="dealColumn"/>
|
||||
FROM tb_record_deal
|
||||
WHERE del_sign = 0
|
||||
<if test="recordId != null">AND record_id = #{recordId}</if>
|
||||
<if test="recordName != null and recordName != ''">AND record_name LIKE CONCAT('%', #{recordName}, '%')</if>
|
||||
<if test="recordType != null">AND record_type = #{recordType}</if>
|
||||
ORDER BY create_time DESC
|
||||
</select>
|
||||
|
||||
<!-- 根据异常记录ID查询 -->
|
||||
<select id="selectByRecordId" resultType="com.rczn.rcznautoplc.domain.RecordDeal">
|
||||
SELECT
|
||||
<include refid="baseColumn"/>,
|
||||
<include refid="dealColumn"/>
|
||||
FROM tb_record_deal
|
||||
WHERE del_sign = 0 AND record_id = #{recordId}
|
||||
ORDER BY create_time DESC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -6,14 +6,14 @@
|
||||
</sql>
|
||||
|
||||
<sql id="recordInfoColumn">
|
||||
record_name, record_type, record_status, record_content
|
||||
island_id, dev_id, record_name, record_type, record_status, record_content
|
||||
</sql>
|
||||
|
||||
<insert id="insert" useGeneratedKeys="true" keyProperty="id">
|
||||
INSERT INTO tb_record_info (
|
||||
<include refid="recordInfoColumn"/>,
|
||||
create_id, create_time, update_id, update_time, del_sign
|
||||
) VALUES (
|
||||
) VALUES (#{islandId}, #{devId},
|
||||
#{recordName}, #{recordType}, #{recordStatus}, #{recordContent},
|
||||
#{createId}, NOW(), #{updateId}, NOW(), 0
|
||||
)
|
||||
@@ -22,6 +22,8 @@
|
||||
<update id="update">
|
||||
UPDATE tb_record_info
|
||||
<set>
|
||||
<if test="islandId != null">island_id = #{islandId},</if>
|
||||
<if test="devId != null">dev_id = #{devId},</if>
|
||||
<if test="recordName != null and recordName != ''">record_name = #{recordName},</if>
|
||||
<if test="recordType != null">record_type = #{recordType},</if>
|
||||
<if test="recordStatus != null">record_status = #{recordStatus},</if>
|
||||
|
||||
@@ -28,7 +28,7 @@ public class JwtUtil {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGFpbXMiOnsicGVybWlzc2lvbnMiOlsiMTExMSIsIjIyMiIsIjU1NSJdLCJpZCI6MywidXNlcm5hbWUiOiJzdHJpbmcifSwiZXhwIjoxNzc2NzE2NzAyfQ.ynjs9Ys0CxoZjRstjz3mjr3c6NYMFiV3MmTGQYpJmKQ";//genToken(null);
|
||||
String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGFpbXMiOnsicGVybWlzc2lvbnMiOlsic3lzIiwiZGF0YSIsInRiIiwic3lzOnVzZXIiLCJzeXM6cm9sZSIsInN5czpwZXJtaXNzaW9uIiwic3lzOmRlcGFydG1lbnQiLCJzeXM6bWFuYWdlbG9nIiwiZGF0YTpwbGMiLCJkYXRhOmRldnBhcmFtIiwiZGF0YTpkZXYiLCJkYXRhOmlzbGFuZCIsImRhdGE6c29wIiwidGI6Z29vZGNvbnRyb2wiLCJ0Yjpnb29kcmVjb3JkIiwic3lzOnVzZXI6YWRkIiwic3lzOnVzZXI6dXBkIiwic3lzOnVzZXI6ZGVsIiwic3lzOnVzZXI6dXNlcnJvbGUiLCJzeXM6cm9sZTphZGQiLCJzeXM6cm9sZTp1cGQiLCJzeXM6cm9sZTpkZWwiLCJzeXM6cm9sZTpyb2xlcGVybWlzc2lvbiIsInN5czpwZXJtaXNzaW9uOmFkZCIsInN5czpwZXJtaXNzaW9uOnVwZCIsInN5czpwZXJtaXNzaW9uOmRlbCIsInN5czpkZXBhcnRtZW50OmFkZCIsInN5czpkZXBhcnRtZW50OnVwZCIsInN5czpkZXBhcnRtZW50OmRlbCIsInN5czptYW5hZ2Vsb2c6ZGV0YWlsIiwiZGF0YTpwbGM6YWRkIiwiZGF0YTpwbGM6dXBkIiwiZGF0YTpwbGM6ZGVsIiwiZGF0YTpkZXZwYXJhbTphZGQiLCJkYXRhOmRldnBhcmFtOnVwZCIsImRhdGE6ZGV2cGFyYW06ZGVsIiwiZGF0YTpkZXZwYXJhbTpyYW5nZSIsImRhdGE6ZGV2cGFyYW06c2VsZWN0IiwiZGF0YTpkZXY6YWRkIiwiZGF0YTpkZXY6dXBkIiwiZGF0YTpkZXY6ZGVsIiwiZGF0YTpkZXY6c2V0cGFyYW1ldGVycyIsImRhdGE6aXNsYW5kOmFkZCIsImRhdGE6aXNsYW5kOnVwZCIsImRhdGE6aXNsYW5kOmRlbCIsImRhdGE6c29wOmFkZCIsImRhdGE6c29wOmNsZWFyIiwiZGF0YTpzb3A6c2F2ZSIsInRiOmdvb2Rjb250cm9sOmNob29zZVNPUCIsInRiOmdvb2Rjb250cm9sOnVwZFNPUCIsInRiOmdvb2Rjb250cm9sOnZpZXdTT1AiLCJ0Yjpnb29kY29udHJvbDp1cGQiLCJ0Yjpnb29kY29udHJvbDpkZWwiLCJ0Yjpnb29kY29udHJvbDptb2RlbCIsInRiOmdvb2Rjb250cm9sOmNvbm5lY3Rpb24iLCJ0Yjpnb29kY29udHJvbDpleGVjdXRlIiwidGI6Z29vZGNvbnRyb2w6c3RvcCIsInRiOmdvb2Rjb250cm9sOnJlc2V0IiwidGI6Z29vZHJlY29yZDpkZXRhaWwiXSwiaWQiOjEsInVzZXJuYW1lIjoiYWRtaW4ifSwiZXhwIjoxNzc4MDc5OTM0fQ.L1SbAL7Vjzjrl7WjggVQXHlNuaYDXWgvvK3H5a0D5bY";//genToken(null);
|
||||
System.out.println(token);
|
||||
Map<String, Object> claims = parseToken(token);
|
||||
System.out.println(claims);
|
||||
|
||||
Reference in New Issue
Block a user