Merge remote-tracking branch 'origin/develop' into develop

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;
 
     //*********************************路网设施增删改查******************************************
 
@@ -39,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));
@@ -52,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));
@@ -65,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));
@@ -79,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) {
@@ -93,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) {
@@ -107,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<String> ids) {

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;
 }