From b6d9107218f39c6a5b61085d279b756e7fc54e19 Mon Sep 17 00:00:00 2001 From: xjm Date: Fri, 2 Aug 2024 17:13:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=B3=A8=E6=96=B0=E5=A2=9E=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2,=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9,=E9=98=B2=E6=B1=9B=E5=91=A8?= =?UTF-8?q?=E6=9C=9F=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?,=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=E5=89=8D=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E9=83=A8=E7=BD=B2,?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/whdc/component/MyPostConstruct.java | 2 ++ .../whdc/controller/ShCallWordController.java | 11 +++--- .../com/whdc/mapper/ShCallWordMapper.java | 4 +++ .../com/whdc/model/dto/ShCallWordDto.java | 6 ++-- .../java/com/whdc/model/dto/ShPeriodDto.java | 6 ++-- .../com/whdc/service/ShCallWordService.java | 3 ++ .../impl/ShAddressBookServiceImpl.java | 35 +++++++++++++++++++ .../service/impl/ShCallWordServiceImpl.java | 7 ++++ src/main/resources/application.yml | 1 + src/main/resources/mapper/ShPeriodMapper.xml | 2 +- 10 files changed, 63 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/whdc/component/MyPostConstruct.java b/src/main/java/com/whdc/component/MyPostConstruct.java index 332dd1c..9422c67 100644 --- a/src/main/java/com/whdc/component/MyPostConstruct.java +++ b/src/main/java/com/whdc/component/MyPostConstruct.java @@ -195,7 +195,9 @@ public class MyPostConstruct { public void recoveryShAddressBookSpotCheck() { boolean update = shAddressBookService.lambdaUpdate() .set(ShAddressBook::getIsSpotCheck, 0) + .set(ShAddressBook::getCallStatus, 0) .eq(ShAddressBook::getIsSpotCheck, 1) + .eq(ShAddressBook::getDel, 1) .update(); log.info("恢复山洪负责人抽查状态定时任务执行结果: " + update); } diff --git a/src/main/java/com/whdc/controller/ShCallWordController.java b/src/main/java/com/whdc/controller/ShCallWordController.java index ef8c6db..f8fad4d 100644 --- a/src/main/java/com/whdc/controller/ShCallWordController.java +++ b/src/main/java/com/whdc/controller/ShCallWordController.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import java.io.Serializable; import java.util.Date; +import java.util.List; import java.util.Objects; /** @@ -69,11 +70,11 @@ public class ShCallWordController { return ResultJson.ok(service.removeById(id)); } -// @ApiOperation(value = "列表") -// @PostMapping("/list") -// public ResultJson> list() { -// return ResultJson.ok(service.lambdaQuery().list()); -// } + @ApiOperation(value = "列表") + @PostMapping("/list") + public ResultJson> list(@RequestBody ShCallWordDto dto) { + return ResultJson.ok(service.list(dto)); + } @ApiOperation(value = "分页") @PostMapping("/page") diff --git a/src/main/java/com/whdc/mapper/ShCallWordMapper.java b/src/main/java/com/whdc/mapper/ShCallWordMapper.java index d9fa4cb..b96f007 100644 --- a/src/main/java/com/whdc/mapper/ShCallWordMapper.java +++ b/src/main/java/com/whdc/mapper/ShCallWordMapper.java @@ -7,6 +7,8 @@ import com.whdc.model.entity.ShCallWord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 描述: 备注 * author: xusan @@ -17,4 +19,6 @@ public interface ShCallWordMapper extends BaseMapper { IPage page(@Param("page") IPage page, @Param("dto") ShCallWordDto dto); + List page(@Param("dto") ShCallWordDto dto); + } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/dto/ShCallWordDto.java b/src/main/java/com/whdc/model/dto/ShCallWordDto.java index 2c32f59..2dfe994 100644 --- a/src/main/java/com/whdc/model/dto/ShCallWordDto.java +++ b/src/main/java/com/whdc/model/dto/ShCallWordDto.java @@ -7,8 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.util.Date; - /** * Description: * Created by XuSan on 2024/7/31. @@ -24,10 +22,10 @@ public class ShCallWordDto extends FindPageDto { @ApiModelProperty(value = "开始时间") - private Date stm; + private String stm; @ApiModelProperty(value = "结束时间") - private Date etm; + private String etm; @Schema(description="责任人类型1 行政责任人,包保责任人") private String shAbType1; diff --git a/src/main/java/com/whdc/model/dto/ShPeriodDto.java b/src/main/java/com/whdc/model/dto/ShPeriodDto.java index 5dc220d..d3675b5 100644 --- a/src/main/java/com/whdc/model/dto/ShPeriodDto.java +++ b/src/main/java/com/whdc/model/dto/ShPeriodDto.java @@ -7,8 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import java.util.Date; - /** * Description: * Created by XuSan on 2024/7/31. @@ -24,10 +22,10 @@ public class ShPeriodDto extends FindPageDto { @ApiModelProperty(value = "开始时间") - private Date stm; + private String stm; @ApiModelProperty(value = "结束时间") - private Date etm; + private String etm; @Schema(description="防汛周期") private String name; diff --git a/src/main/java/com/whdc/service/ShCallWordService.java b/src/main/java/com/whdc/service/ShCallWordService.java index 8e9e806..9be716b 100644 --- a/src/main/java/com/whdc/service/ShCallWordService.java +++ b/src/main/java/com/whdc/service/ShCallWordService.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.whdc.model.dto.ShCallWordDto; import com.whdc.model.entity.ShCallWord; +import java.util.List; + /** * 描述: 备注 * author: xusan @@ -14,6 +16,7 @@ import com.whdc.model.entity.ShCallWord; public interface ShCallWordService extends IService { IPage page(ShCallWordDto dto); + List list(ShCallWordDto dto); } diff --git a/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java b/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java index 442e403..8e689bc 100644 --- a/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/ShAddressBookServiceImpl.java @@ -83,6 +83,41 @@ public class ShAddressBookServiceImpl extends ServiceImpl { + + // 设置负责区域 + switch (finalType1Str1) { + case "行政责任人":{ +// type1Str = "行政责任人"; + String type2 = o.getType2(); + if (StringUtils.isNotBlank(type2)){ + if (type2.contains("市")){ + o.setLand(o.getCity()); + }else if (type2.contains("县")){ + o.setLand(o.getCounty()); + }else if (type2.contains("乡")){ + o.setLand(o.getArea()); + }else if (type2.contains("村")){ + o.setLand(o.getVillage()); + } + }} + break; + case "包保责任人":{ +// type1Str = "包保责任人"; + String type2 = o.getType2(); + if (StringUtils.isNotBlank(type2)){ + if (type2.contains("市")){ + o.setLand(o.getCounty()); + }else if (type2.contains("县")){ + o.setLand(o.getArea()); + }else if (type2.contains("乡")){ + o.setLand(o.getVillage()); + } + }} + break; + default: + throw new MyException("参数错误"); + } + o.setType1(finalType1Str1); if (Objects.isNull(o.getSort())) { o.setSort(sort.getAndIncrement()); diff --git a/src/main/java/com/whdc/service/impl/ShCallWordServiceImpl.java b/src/main/java/com/whdc/service/impl/ShCallWordServiceImpl.java index 1cd3fab..de40bd9 100644 --- a/src/main/java/com/whdc/service/impl/ShCallWordServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/ShCallWordServiceImpl.java @@ -8,6 +8,8 @@ import com.whdc.model.entity.ShCallWord; import com.whdc.service.ShCallWordService; import org.springframework.stereotype.Service; +import java.util.List; + import static com.whdc.model.MyConstant.REDIS_KEY; @@ -25,4 +27,9 @@ public class ShCallWordServiceImpl extends ServiceImpl page(ShCallWordDto dto) { return getBaseMapper().page(dto.getPage(), dto); } + + @Override + public List list(ShCallWordDto dto) { + return getBaseMapper().page(dto); + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6984b54..375d68a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,4 @@ + server: port: 20020 servlet: diff --git a/src/main/resources/mapper/ShPeriodMapper.xml b/src/main/resources/mapper/ShPeriodMapper.xml index 8882213..0e3b03c 100644 --- a/src/main/resources/mapper/ShPeriodMapper.xml +++ b/src/main/resources/mapper/ShPeriodMapper.xml @@ -13,7 +13,7 @@ AND T.CREATE_TIME BETWEEN #{dto.stm} AND #{dto.etm} - AND T.NAME = #{dto.name} + AND T.NAME LIKE CONCAT('%', #{dto.name}, '%') ORDER BY T.CREATE_TIME DESC