diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxFormDTO.java new file mode 100644 index 0000000000..b0e96441bf --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/WghSjxxFormDTO.java @@ -0,0 +1,37 @@ +package com.epmet.opendata.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; +import java.net.Inet4Address; + +@Data +public class WghSjxxFormDTO implements Serializable { + + private static final long serialVersionUID = 3208547934202974728L; + + /** + * 事件来源 + */ + private String infosourcename; + + /** + * 事件类别 + */ + private String infotypename; + + /** + * 社区名称 + */ + private String communityname; + + /** + * 事件状态 + */ + private String statusname; + + private Integer page; + + private Integer limit; +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java new file mode 100644 index 0000000000..709e21f049 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/WghSjxxResultDTO.java @@ -0,0 +1,47 @@ +package com.epmet.opendata.dto.result; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class WghSjxxResultDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = -5318466282262952340L; + + /** + * 事件来源 + */ + private String infosourcename; + + /** + * 事件类别 + */ + private String infotypename; + + /** + * 社区名称 + */ + private String communityname; + + /** + * 事见描述 + */ + private String description; + + /** + * 事见地址 + */ + private String address; + + /** + * 事见状态 + */ + private String statusname; + + /** + * 街道名称 + */ + private String streetname; +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java index 4d3a6cd04b..2c15dcd393 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java @@ -1,7 +1,9 @@ package com.epmet.opendata.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -10,6 +12,9 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.form.WghSjxxFormDTO; +import com.epmet.opendata.dto.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.WghSjxxResultDTO; import com.epmet.opendata.dto.wgh.WghSjxxbDTO; import com.epmet.opendata.excel.WghSjxxbExcel; import com.epmet.opendata.service.WghSjxxbService; @@ -92,4 +97,19 @@ public class WghSjxxbController { return new Result(); } + /** + * 事件信息分页 + * + * @param form + * @param tokenDto + * @return com.epmet.commons.tools.utils.Result> + * @author LZN + * @date 2022/6/29 10:42 + */ + @PostMapping("getPage") + public Result> getSjxxPage(@RequestBody WghSjxxFormDTO form, @LoginUser TokenDto tokenDto) { + PageData dto = wghSjxxbService.getSjxxPage(form); + return new Result>().ok(dto); + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java index d2806b93fe..3b82cc612b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java @@ -1,8 +1,13 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.dto.form.WghSjxxFormDTO; +import com.epmet.opendata.dto.result.WghSjxxResultDTO; import com.epmet.opendata.entity.WghSjxxbEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 事件信息 @@ -14,4 +19,15 @@ import org.apache.ibatis.annotations.Mapper; public interface WghSjxxbDao extends BaseDao { int deleteAll(); + + + /** + * 事件信息分页 + * + * @param form + * @return java.util.List + * @author LZN + * @date 2022/6/29 10:43 + */ + List getSjxxPage(@Param("form") WghSjxxFormDTO form); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java index 1185b76fcb..791059b024 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java @@ -3,6 +3,8 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.form.WghSjxxFormDTO; +import com.epmet.opendata.dto.result.WghSjxxResultDTO; import com.epmet.opendata.dto.wgh.WghSjxxbDTO; import com.epmet.opendata.entity.WghSjxxbEntity; @@ -86,4 +88,14 @@ public interface WghSjxxbService extends BaseService { * @date 2022/6/14 16:02 */ void getPreserSjxxVation(PreserVationFormDTO dto); + + /** + * 事件信息分页 + * + * @param form + * @return com.epmet.commons.tools.page.PageData + * @author LZN + * @date 2022/6/29 10:43 + */ + PageData getSjxxPage(WghSjxxFormDTO form); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java index ad2dee773b..c0f823a9f4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java @@ -14,12 +14,17 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghSjxxbDao; import com.epmet.opendata.dto.constant.CaWghDataConstant; import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.form.WghSjxxFormDTO; +import com.epmet.opendata.dto.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.WghSjxxResultDTO; import com.epmet.opendata.dto.wgh.WghSjxxbDTO; import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghSjxxbEntity; import com.epmet.opendata.redis.WghSjxxbRedis; import com.epmet.opendata.service.WghSjxxbService; import com.epmet.opendata.util.AesUtils; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -130,6 +135,22 @@ public class WghSjxxbServiceImpl extends BaseServiceImpl + * @author LZN + * @date 2022/6/29 10:43 + */ + @Override + public PageData getSjxxPage(WghSjxxFormDTO form) { + PageHelper.startPage(form.getPage(), form.getLimit()); + List result = baseDao.getSjxxPage(form); + PageInfo info = new PageInfo<>(result); + return new PageData<>(result, info.getTotal()); + } + private int listLouDong(PreserVationFormDTO dto) throws Exception { String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml index ea94d5912f..25f8095938 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml @@ -23,6 +23,33 @@ delete from wgh_sjxxb +