diff --git a/casic-server/pom.xml b/casic-server/pom.xml index fc54abe..f373547 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-file + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index fc54abe..f373547 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-file + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java index 6550805..f062919 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -1,22 +1,19 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.dto.AlarmRecordRequest; -import com.casic.missiles.modular.system.entity.AlarmRecord; import com.casic.missiles.modular.system.entity.AlarmRule; -import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.service.IAlarmRuleService; import com.casic.missiles.modular.system.util.ReturnUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; diff --git a/casic-server/pom.xml b/casic-server/pom.xml index fc54abe..f373547 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ ${extension.version} + com.casic + casic-file + ${admin.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java index 6550805..f062919 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -1,22 +1,19 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.modular.system.dto.AlarmRecordRequest; -import com.casic.missiles.modular.system.entity.AlarmRecord; import com.casic.missiles.modular.system.entity.AlarmRule; -import com.casic.missiles.modular.system.exception.BusinessException; import com.casic.missiles.modular.system.service.IAlarmRuleService; import com.casic.missiles.modular.system.util.ReturnUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 628fd13..cdb3ee2 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -24,6 +24,8 @@ db: init: enable: false + file.uploadPath: C:\casic\tmp\ + file-down-path: C:\casic\tmp\ logging: level.root: info level.com.casic: debug