diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/ScreenController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/ScreenController.java new file mode 100644 index 00000000..d91c2226 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/ScreenController.java @@ -0,0 +1,39 @@ +package com.ruoyi.tcZz.controller; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.tcZz.domain.TcAqg; +import com.ruoyi.tcZz.service.ScreenService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 大屏接口 + */ +@Api(tags = "大屏接口") +@RestController +@RequestMapping("/tcZz/networkEcology/screen") +public class ScreenController extends BaseController { + /** + * 服务层 + */ + @Autowired + private ScreenService screenService; + + /** + * 大屏监管对象 + */ + + @ApiOperation(value = "大屏监管对象", response = TcAqg.class) + @GetMapping("/screensupervision") + public AjaxResult screenSupervision(TcAqg tcAqg) { +// List list = screenService.selectTcAqgList(tcAqg); + return null; + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcIdcdwController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcIdcdwController.java index 6361100e..1bd4e6c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcIdcdwController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcIdcdwController.java @@ -1,24 +1,20 @@ package com.ruoyi.tcZz.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.ruoyi.tcZz.domain.TcWljg; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.tcZz.domain.TcIdcdw; import com.ruoyi.tcZz.service.ITcIdcdwService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** * IDC单位Controller * @@ -26,7 +22,7 @@ import org.springframework.web.multipart.MultipartFile; * @date 2023-10-13 */ @RestController -@Api("IDC单位") +@Api(tags = "IDC单位") @RequestMapping("/tcZz/networkSecurity/idcdw") public class TcIdcdwController extends BaseController { @Autowired @@ -35,7 +31,7 @@ public class TcIdcdwController extends BaseController { /** * 查询 IDC单位列表 */ - @ApiOperation(value = "查询IDC单位列表",response =TcIdcdw.class ) + @ApiOperation(value = "查询IDC单位列表", response = TcIdcdw.class) @GetMapping("/list") public TableDataInfo list(TcIdcdw tcIdcdw) { startPage(); @@ -112,7 +108,7 @@ public class TcIdcdwController extends BaseController { @ApiOperation("批量启用禁用") @GetMapping("/isStatus") public AjaxResult isStatus(@RequestParam("isStatus") Integer isStatus, @RequestParam("ids") List ids) { - tcIdcdwService.updateByisStatus(isStatus,ids); + tcIdcdwService.updateByisStatus(isStatus, ids); return AjaxResult.success(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcCy.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcCy.java index 0846092e..e1545b2b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcCy.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcCy.java @@ -35,7 +35,8 @@ public class TcCy extends BaseEntity private Long cyCount; /** 区域id */ - @Excel(name = "区域id",readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城") + //,readConverterExp = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城",combo = "1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城" + @Excel(name = "区域id") @ApiModelProperty(value = "区域id,1=太仓市,2=城厢镇,3=沙溪镇,4=浏河镇,5=浮桥镇,6=璜泾镇,7=双凤镇,8=娄东街道,9=陆渡街道,10=科教新城") private String areaId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java new file mode 100644 index 00000000..a2b1de5c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ScreenService.java @@ -0,0 +1,12 @@ +package com.ruoyi.tcZz.service; + +/** + * 大屏接口服务层 + */ +public interface ScreenService { + + + /** + * + */ +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java new file mode 100644 index 00000000..edf7a87d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/ScreenServiceImpl.java @@ -0,0 +1,9 @@ +package com.ruoyi.tcZz.service.impl; + +import com.ruoyi.tcZz.service.ScreenService; + +/** + * 大屏接口实现层 + */ +public class ScreenServiceImpl implements ScreenService { +} diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcWljgMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcWljgMapper.xml index a634c082..6870bec3 100644 --- a/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcWljgMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcWljgMapper.xml @@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and remark = #{remark} + order by start_time desc