From 176496eac34f6cc61dcfe6994ec974240bcffb62 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Tue, 18 Jun 2024 16:10:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/DcNoStakeWarningTableController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java b/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java index 278b1b08..d27423b3 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java @@ -9,6 +9,7 @@ import com.zc.business.domain.DcFacility; import com.zc.business.domain.DcNoStakeWarningTable; import com.zc.business.service.IDcFacilityService; import com.zc.business.service.IDcNoStakeWarningTableService; +import com.zc.business.service.impl.DcNoStakeWarningTableServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -25,10 +26,10 @@ import java.util.List; */ @Api(tags = {"无桩号预警"}) @RestController -@RequestMapping("/business/facility") +@RequestMapping("/business/DcNoStakeWarningTableServiceImpl") public class DcNoStakeWarningTableController extends BaseController { @Resource - private IDcNoStakeWarningTableService dcNoStakeWarningTableService; + private DcNoStakeWarningTableServiceImpl dcNoStakeWarningTableService; //*********************************路网设施增删改查****************************************** From afa1dcfc44b2756c8cb18f55e00a945fb55d9656 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Tue, 18 Jun 2024 16:16:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A0=E6=A1=A9?= =?UTF-8?q?=E5=8F=B7=E9=A2=84=E8=AD=A6controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DcNoStakeWarningTableController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java b/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java index d27423b3..c35c3160 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcNoStakeWarningTableController.java @@ -40,7 +40,7 @@ public class DcNoStakeWarningTableController extends BaseController { * @return 分页查询结果 */ @ApiOperation("分页查询路网设施列表") - @PreAuthorize("@ss.hasPermi('iot:facility:list')") + @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:list')") @GetMapping("list") public TableDataInfo listFacility(DcNoStakeWarningTable dcNoStakeWarningTable) { return getDataTable(dcNoStakeWarningTableService.pageDcNoStakeWarningTable(dcNoStakeWarningTable)); @@ -53,7 +53,7 @@ public class DcNoStakeWarningTableController extends BaseController { * @return 查询结果 */ @ApiOperation("无分页查询路网设施列表") - @PreAuthorize("@ss.hasPermi('iot:facility:query')") + @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:query')") @GetMapping("query") public AjaxResult queryFacility(DcNoStakeWarningTable dcNoStakeWarningTable) { return AjaxResult.success(dcNoStakeWarningTableService.listDcNoStakeWarningTable(dcNoStakeWarningTable)); @@ -66,7 +66,7 @@ public class DcNoStakeWarningTableController extends BaseController { * @return 查询结果 */ @ApiOperation("根据id查询路网设施信息") - @PreAuthorize("@ss.hasPermi('iot:facility:query')") + @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:query')") @GetMapping("{id}") public AjaxResult getFacility(@PathVariable String id) { return AjaxResult.success(dcNoStakeWarningTableService.getDcNoStakeWarningTable(id)); @@ -80,7 +80,7 @@ public class DcNoStakeWarningTableController extends BaseController { * @return 新增操作结果 */ @ApiOperation("新增") - @PreAuthorize("@ss.hasPermi('iot:facility:add')") + @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:add')") @Log(title = "新增路网设施", businessType = BusinessType.INSERT) @PostMapping public AjaxResult addFacility(@Valid @RequestBody DcNoStakeWarningTable dcNoStakeWarningTable) { @@ -94,7 +94,7 @@ public class DcNoStakeWarningTableController extends BaseController { * @return 修改操作结果 */ @ApiOperation("修改") - @PreAuthorize("@ss.hasPermi('iot:facility:edit')") + @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:edit')") @Log(title = "修改路网设施", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult editFacility(@Valid @RequestBody DcNoStakeWarningTable dcNoStakeWarningTable) { @@ -108,7 +108,7 @@ public class DcNoStakeWarningTableController extends BaseController { * @return 删除操作结果 */ @ApiOperation("删除") - @PreAuthorize("@ss.hasPermi('iot:facility:remove')") + @PreAuthorize("@ss.hasPermi('iot:dcNoStakeWarningTable:remove')") @Log(title = "删除", businessType = BusinessType.DELETE) @DeleteMapping("{ids}") public AjaxResult removeFacility(@PathVariable List ids) { From 0e649bae1df52daff1ffb1ed57dda4eda0bc94d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Tue, 18 Jun 2024 17:27:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=97=A0=E6=A1=A9?= =?UTF-8?q?=E5=8F=B7=E9=A2=84=E8=AD=A6=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zc/business/domain/DcNoStakeWarningTable.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/domain/DcNoStakeWarningTable.java b/zc-business/src/main/java/com/zc/business/domain/DcNoStakeWarningTable.java index f2a28e6b..91f93ac6 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcNoStakeWarningTable.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcNoStakeWarningTable.java @@ -18,7 +18,7 @@ public class DcNoStakeWarningTable { private Long id; @ApiModelProperty("预警描述") @Excel(name = "预警描述") - private Long warningDescription; + private String warningDescription; @ApiModelProperty("预警类型") @Excel(name = "预警类型", readConverterExp = "1=交通流预警,2=气象预警") private String warningType; @@ -28,5 +28,7 @@ public class DcNoStakeWarningTable { @ApiModelProperty("预警时间") @Excel(name = "预警时间") private Date warningTime; - + @ApiModelProperty("其他配置") + @Excel(name = "其他配置") + private String otherConfig; }