diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcYqxxltjController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcYqxxltjController.java index 887588b2..a91351e2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcYqxxltjController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcYqxxltjController.java @@ -22,22 +22,22 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** - * 舆情信息量统计Controller + * 舆情信息量统计明細Controller * * @author ruoyi * @date 2023-10-12 */ @RestController -@RequestMapping("/tcZz/yqxxltj") +@RequestMapping("/tcZz/netWorkYq/yqxxltj") public class TcYqxxltjController extends BaseController { @Autowired private ITcYqxxltjService tcYqxxltjService; /** - * 查询舆情信息量统计列表 + * 查询舆情信息量统计明細列表 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqxxltj:list')") + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqxxltj:list')") @GetMapping("/list") public TableDataInfo list(TcYqxxltj tcYqxxltj) { @@ -47,22 +47,22 @@ public class TcYqxxltjController extends BaseController } /** - * 导出舆情信息量统计列表 + * 导出舆情信息量统计明細列表 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqxxltj:export')") - @Log(title = "舆情信息量统计", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqxxltj:export')") + @Log(title = "舆情信息量统计明細", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TcYqxxltj tcYqxxltj) { List list = tcYqxxltjService.selectTcYqxxltjList(tcYqxxltj); ExcelUtil util = new ExcelUtil(TcYqxxltj.class); - util.exportExcel(response, list, "舆情信息量统计数据"); + util.exportExcel(response, list, "舆情信息量统计明細数据"); } /** - * 获取舆情信息量统计详细信息 + * 获取舆情信息量统计明細详细信息 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqxxltj:query')") + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqxxltj:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -70,10 +70,10 @@ public class TcYqxxltjController extends BaseController } /** - * 新增舆情信息量统计 + * 新增舆情信息量统计明細 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqxxltj:add')") - @Log(title = "舆情信息量统计", businessType = BusinessType.INSERT) + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqxxltj:add')") + @Log(title = "舆情信息量统计明細", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody TcYqxxltj tcYqxxltj) { @@ -81,10 +81,10 @@ public class TcYqxxltjController extends BaseController } /** - * 修改舆情信息量统计 + * 修改舆情信息量统计明細 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqxxltj:edit')") - @Log(title = "舆情信息量统计", businessType = BusinessType.UPDATE) + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqxxltj:edit')") + @Log(title = "舆情信息量统计明細", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody TcYqxxltj tcYqxxltj) { @@ -92,10 +92,10 @@ public class TcYqxxltjController extends BaseController } /** - * 删除舆情信息量统计 + * 删除舆情信息量统计明細 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqxxltj:remove')") - @Log(title = "舆情信息量统计", businessType = BusinessType.DELETE) + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqxxltj:remove')") + @Log(title = "舆情信息量统计明細", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcYqzsController.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcYqzsController.java index 180baab0..c8fb595b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcYqzsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/controller/TcYqzsController.java @@ -28,7 +28,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * @date 2023-10-12 */ @RestController -@RequestMapping("/tcZz/yqzs") +@RequestMapping("/tcZz/netWorkYq/yqzs") public class TcYqzsController extends BaseController { @Autowired @@ -37,7 +37,7 @@ public class TcYqzsController extends BaseController /** * 查询舆情走势图列表 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqzs:list')") + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqzs:list')") @GetMapping("/list") public TableDataInfo list(TcYqzs tcYqzs) { @@ -49,7 +49,7 @@ public class TcYqzsController extends BaseController /** * 导出舆情走势图列表 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqzs:export')") + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqzs:export')") @Log(title = "舆情走势图", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TcYqzs tcYqzs) @@ -62,7 +62,7 @@ public class TcYqzsController extends BaseController /** * 获取舆情走势图详细信息 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqzs:query')") + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqzs:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class TcYqzsController extends BaseController /** * 新增舆情走势图 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqzs:add')") + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqzs:add')") @Log(title = "舆情走势图", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody TcYqzs tcYqzs) @@ -83,7 +83,7 @@ public class TcYqzsController extends BaseController /** * 修改舆情走势图 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqzs:edit')") + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqzs:edit')") @Log(title = "舆情走势图", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody TcYqzs tcYqzs) @@ -94,7 +94,7 @@ public class TcYqzsController extends BaseController /** * 删除舆情走势图 */ - @PreAuthorize("@ss.hasPermi('tcZz:yqzs:remove')") + @PreAuthorize("@ss.hasPermi('tcZz/netWorkYq:yqzs:remove')") @Log(title = "舆情走势图", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java index fefecdf2..54c19d9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqxxltj.java @@ -2,28 +2,22 @@ package com.ruoyi.tcZz.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 舆情信息量统计对象 tc_yqxxltj + * 舆情信息量统计明細对象 tc_yqxxltj * * @author ruoyi * @date 2023-10-12 */ -@Data -@ApiModel("舆情信息量统计对象") public class TcYqxxltj extends BaseEntity { private static final long serialVersionUID = 1L; /** $column.columnComment */ - @ApiModelProperty(value = "id") private Long id; /** 区域id */ @@ -54,4 +48,96 @@ public class TcYqxxltj extends BaseEntity /** 内容 */ @Excel(name = "内容") private String content; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setAreaId(String areaId) + { + this.areaId = areaId; + } + + public String getAreaId() + { + return areaId; + } + public void setIsStatus(Long isStatus) + { + this.isStatus = isStatus; + } + + public Long getIsStatus() + { + return isStatus; + } + public void setType(Long type) + { + this.type = type; + } + + public Long getType() + { + return type; + } + public void setTitle(String title) + { + this.title = title; + } + + public String getTitle() + { + return title; + } + public void setSource(String source) + { + this.source = source; + } + + public String getSource() + { + return source; + } + public void setDateTime(Date dateTime) + { + this.dateTime = dateTime; + } + + public Date getDateTime() + { + return dateTime; + } + public void setContent(String content) + { + this.content = content; + } + + public String getContent() + { + return content; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("areaId", getAreaId()) + .append("isStatus", getIsStatus()) + .append("type", getType()) + .append("title", getTitle()) + .append("source", getSource()) + .append("dateTime", getDateTime()) + .append("content", getContent()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java index 3e077668..26c62811 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/domain/TcYqzs.java @@ -2,9 +2,6 @@ package com.ruoyi.tcZz.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -16,14 +13,11 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author ruoyi * @date 2023-10-12 */ -@Data -@ApiModel("舆情走势图对象") public class TcYqzs extends BaseEntity { private static final long serialVersionUID = 1L; /** $column.columnComment */ - @ApiModelProperty(value = "id") private Long id; /** 区域id */ @@ -42,4 +36,66 @@ public class TcYqzs extends BaseEntity /** 敏感数量 */ @Excel(name = "敏感数量") private Long count2; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setAreaId(Long areaId) + { + this.areaId = areaId; + } + + public Long getAreaId() + { + return areaId; + } + public void setDateTime(Date dateTime) + { + this.dateTime = dateTime; + } + + public Date getDateTime() + { + return dateTime; + } + public void setCount1(Long count1) + { + this.count1 = count1; + } + + public Long getCount1() + { + return count1; + } + public void setCount2(Long count2) + { + this.count2 = count2; + } + + public Long getCount2() + { + return count2; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("areaId", getAreaId()) + .append("dateTime", getDateTime()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("count1", getCount1()) + .append("count2", getCount2()) + .toString(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcYqxxltjMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcYqxxltjMapper.java index 1de2161a..8449c9a2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcYqxxltjMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/mapper/TcYqxxltjMapper.java @@ -4,7 +4,7 @@ import java.util.List; import com.ruoyi.tcZz.domain.TcYqxxltj; /** - * 舆情信息量统计Mapper接口 + * 舆情信息量统计明細Mapper接口 * * @author ruoyi * @date 2023-10-12 @@ -12,47 +12,47 @@ import com.ruoyi.tcZz.domain.TcYqxxltj; public interface TcYqxxltjMapper { /** - * 查询舆情信息量统计 + * 查询舆情信息量统计明細 * - * @param id 舆情信息量统计主键 - * @return 舆情信息量统计 + * @param id 舆情信息量统计明細主键 + * @return 舆情信息量统计明細 */ public TcYqxxltj selectTcYqxxltjById(Long id); /** - * 查询舆情信息量统计列表 + * 查询舆情信息量统计明細列表 * - * @param tcYqxxltj 舆情信息量统计 - * @return 舆情信息量统计集合 + * @param tcYqxxltj 舆情信息量统计明細 + * @return 舆情信息量统计明細集合 */ public List selectTcYqxxltjList(TcYqxxltj tcYqxxltj); /** - * 新增舆情信息量统计 + * 新增舆情信息量统计明細 * - * @param tcYqxxltj 舆情信息量统计 + * @param tcYqxxltj 舆情信息量统计明細 * @return 结果 */ public int insertTcYqxxltj(TcYqxxltj tcYqxxltj); /** - * 修改舆情信息量统计 + * 修改舆情信息量统计明細 * - * @param tcYqxxltj 舆情信息量统计 + * @param tcYqxxltj 舆情信息量统计明細 * @return 结果 */ public int updateTcYqxxltj(TcYqxxltj tcYqxxltj); /** - * 删除舆情信息量统计 + * 删除舆情信息量统计明細 * - * @param id 舆情信息量统计主键 + * @param id 舆情信息量统计明細主键 * @return 结果 */ public int deleteTcYqxxltjById(Long id); /** - * 批量删除舆情信息量统计 + * 批量删除舆情信息量统计明細 * * @param ids 需要删除的数据主键集合 * @return 结果 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcYqxxltjService.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcYqxxltjService.java index 0cb9f2de..2e3f1f93 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcYqxxltjService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/ITcYqxxltjService.java @@ -4,7 +4,7 @@ import java.util.List; import com.ruoyi.tcZz.domain.TcYqxxltj; /** - * 舆情信息量统计Service接口 + * 舆情信息量统计明細Service接口 * * @author ruoyi * @date 2023-10-12 @@ -12,49 +12,49 @@ import com.ruoyi.tcZz.domain.TcYqxxltj; public interface ITcYqxxltjService { /** - * 查询舆情信息量统计 + * 查询舆情信息量统计明細 * - * @param id 舆情信息量统计主键 - * @return 舆情信息量统计 + * @param id 舆情信息量统计明細主键 + * @return 舆情信息量统计明細 */ public TcYqxxltj selectTcYqxxltjById(Long id); /** - * 查询舆情信息量统计列表 + * 查询舆情信息量统计明細列表 * - * @param tcYqxxltj 舆情信息量统计 - * @return 舆情信息量统计集合 + * @param tcYqxxltj 舆情信息量统计明細 + * @return 舆情信息量统计明細集合 */ public List selectTcYqxxltjList(TcYqxxltj tcYqxxltj); /** - * 新增舆情信息量统计 + * 新增舆情信息量统计明細 * - * @param tcYqxxltj 舆情信息量统计 + * @param tcYqxxltj 舆情信息量统计明細 * @return 结果 */ public int insertTcYqxxltj(TcYqxxltj tcYqxxltj); /** - * 修改舆情信息量统计 + * 修改舆情信息量统计明細 * - * @param tcYqxxltj 舆情信息量统计 + * @param tcYqxxltj 舆情信息量统计明細 * @return 结果 */ public int updateTcYqxxltj(TcYqxxltj tcYqxxltj); /** - * 批量删除舆情信息量统计 + * 批量删除舆情信息量统计明細 * - * @param ids 需要删除的舆情信息量统计主键集合 + * @param ids 需要删除的舆情信息量统计明細主键集合 * @return 结果 */ public int deleteTcYqxxltjByIds(Long[] ids); /** - * 删除舆情信息量统计信息 + * 删除舆情信息量统计明細信息 * - * @param id 舆情信息量统计主键 + * @param id 舆情信息量统计明細主键 * @return 结果 */ public int deleteTcYqxxltjById(Long id); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcYqxxltjServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcYqxxltjServiceImpl.java index 34cec1cb..971a58e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcYqxxltjServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tcZz/service/impl/TcYqxxltjServiceImpl.java @@ -9,7 +9,7 @@ import com.ruoyi.tcZz.domain.TcYqxxltj; import com.ruoyi.tcZz.service.ITcYqxxltjService; /** - * 舆情信息量统计Service业务层处理 + * 舆情信息量统计明細Service业务层处理 * * @author ruoyi * @date 2023-10-12 @@ -21,10 +21,10 @@ public class TcYqxxltjServiceImpl implements ITcYqxxltjService private TcYqxxltjMapper tcYqxxltjMapper; /** - * 查询舆情信息量统计 + * 查询舆情信息量统计明細 * - * @param id 舆情信息量统计主键 - * @return 舆情信息量统计 + * @param id 舆情信息量统计明細主键 + * @return 舆情信息量统计明細 */ @Override public TcYqxxltj selectTcYqxxltjById(Long id) @@ -33,10 +33,10 @@ public class TcYqxxltjServiceImpl implements ITcYqxxltjService } /** - * 查询舆情信息量统计列表 + * 查询舆情信息量统计明細列表 * - * @param tcYqxxltj 舆情信息量统计 - * @return 舆情信息量统计 + * @param tcYqxxltj 舆情信息量统计明細 + * @return 舆情信息量统计明細 */ @Override public List selectTcYqxxltjList(TcYqxxltj tcYqxxltj) @@ -45,9 +45,9 @@ public class TcYqxxltjServiceImpl implements ITcYqxxltjService } /** - * 新增舆情信息量统计 + * 新增舆情信息量统计明細 * - * @param tcYqxxltj 舆情信息量统计 + * @param tcYqxxltj 舆情信息量统计明細 * @return 结果 */ @Override @@ -58,9 +58,9 @@ public class TcYqxxltjServiceImpl implements ITcYqxxltjService } /** - * 修改舆情信息量统计 + * 修改舆情信息量统计明細 * - * @param tcYqxxltj 舆情信息量统计 + * @param tcYqxxltj 舆情信息量统计明細 * @return 结果 */ @Override @@ -71,9 +71,9 @@ public class TcYqxxltjServiceImpl implements ITcYqxxltjService } /** - * 批量删除舆情信息量统计 + * 批量删除舆情信息量统计明細 * - * @param ids 需要删除的舆情信息量统计主键 + * @param ids 需要删除的舆情信息量统计明細主键 * @return 结果 */ @Override @@ -83,9 +83,9 @@ public class TcYqxxltjServiceImpl implements ITcYqxxltjService } /** - * 删除舆情信息量统计信息 + * 删除舆情信息量统计明細信息 * - * @param id 舆情信息量统计主键 + * @param id 舆情信息量统计明細主键 * @return 结果 */ @Override diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/TcCyMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcCyMapper.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mapper/tcZz/TcCyMapper.xml rename to ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcCyMapper.xml diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/TcYqxxltjMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqxxltjMapper.xml similarity index 83% rename from ruoyi-admin/src/main/resources/mapper/tcZz/TcYqxxltjMapper.xml rename to ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqxxltjMapper.xml index 98b44aca..b4bf42bd 100644 --- a/ruoyi-admin/src/main/resources/mapper/tcZz/TcYqxxltjMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqxxltjMapper.xml @@ -27,13 +27,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-admin/src/main/resources/mapper/tcZz/TcYqzsMapper.xml b/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqzsMapper.xml similarity index 83% rename from ruoyi-admin/src/main/resources/mapper/tcZz/TcYqzsMapper.xml rename to ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqzsMapper.xml index 45ad19fc..24c34d91 100644 --- a/ruoyi-admin/src/main/resources/mapper/tcZz/TcYqzsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/tcZz/netWorkYq/TcYqzsMapper.xml @@ -24,8 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"