From 03c54e4cc579eab08121bebef386da0dbe46dfe0 Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 13 May 2024 10:07:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cation.java => FxkhTxlApiApplication.java} | 4 +- .../com/whdc/controller/AbUdRController.java | 100 ++++++++++ .../controller/AddressBookController.java | 184 ++++++++++++++++++ .../com/whdc/controller/AdinfoController.java | 122 ++++++++++++ .../com/whdc/controller/ERuleController.java | 138 ------------- .../controller/EStationRulesController.java | 123 ------------ .../com/whdc/controller/FcController.java | 99 ++++++++++ .../whdc/controller/LoginInfoController.java | 99 ++++++++++ .../controller/OrganizationController.java | 99 ++++++++++ .../whdc/controller/UnitDictController.java | 99 ++++++++++ .../com/whdc/controller/UserController.java | 99 ++++++++++ .../whdc/controller/VersionsController.java | 48 +++++ .../java/com/whdc/mapper/AbUdRMapper.java | 18 +- .../com/whdc/mapper/AddressBookMapper.java | 22 ++- .../java/com/whdc/mapper/AdinfoMapper.java | 21 +- src/main/java/com/whdc/mapper/FcMapper.java | 22 ++- .../java/com/whdc/mapper/LoginInfoMapper.java | 22 ++- .../com/whdc/mapper/OrganizationMapper.java | 22 ++- .../java/com/whdc/mapper/UnitDictMapper.java | 23 +-- src/main/java/com/whdc/mapper/UserMapper.java | 23 +-- .../java/com/whdc/mapper/VersionsMapper.java | 22 ++- .../com/whdc/model/dto/AddressBootDto.java | 21 ++ .../java/com/whdc/model/dto/ERuleDto.java | 72 ------- .../java/com/whdc/model/dto/FindRuleDto.java | 38 ---- .../com/whdc/model/dto/FindStationDto.java | 22 --- .../java/com/whdc/model/entity/AbUdR.java | 33 +++- .../com/whdc/model/entity/AddressBook.java | 61 +++++- .../java/com/whdc/model/entity/Adinfo.java | 51 +++-- .../java/com/whdc/model/entity/ERule.java | 147 -------------- src/main/java/com/whdc/model/entity/Fc.java | 44 ++++- .../java/com/whdc/model/entity/LoginInfo.java | 41 +++- .../com/whdc/model/entity/Organization.java | 47 ++++- .../java/com/whdc/model/entity/UnitDict.java | 45 ++++- src/main/java/com/whdc/model/entity/User.java | 41 +++- .../java/com/whdc/model/entity/Versions.java | 49 ++++- .../com/whdc/model/enums/VersionsType.java | 73 +++++++ src/main/java/com/whdc/model/vo/AdcdTree.java | 26 +++ src/main/java/com/whdc/model/vo/ERuleVo.java | 31 --- .../com/whdc/model/vo/EStationRulesVo.java | 45 ----- .../java/com/whdc/model/vo/ValidateVo.java | 36 ---- .../java/com/whdc/service/IAbUdRService.java | 24 +++ .../com/whdc/service/IAddressBookService.java | 25 +++ .../java/com/whdc/service/IAdinfoService.java | 26 +++ .../java/com/whdc/service/IERuleService.java | 25 --- .../whdc/service/IEStationRulesService.java | 30 --- .../java/com/whdc/service/IFcService.java | 24 +++ .../com/whdc/service/ILoginInfoService.java | 24 +++ .../whdc/service/IOrganizationService.java | 24 +++ .../com/whdc/service/IUnitDictService.java | 24 +++ .../java/com/whdc/service/IUserService.java | 24 +++ .../com/whdc/service/IVersionsService.java | 27 +++ .../whdc/service/impl/AbUdRServiceImpl.java | 36 ++++ .../service/impl/AddressBookServiceImpl.java | 37 ++++ .../whdc/service/impl/AdinfoServiceImpl.java | 184 ++++++++++++++++++ .../whdc/service/impl/ERuleServiceImpl.java | 44 ----- .../impl/EStationRulesServiceImpl.java | 83 -------- .../com/whdc/service/impl/FcServiceImpl.java | 36 ++++ .../service/impl/LoginInfoServiceImpl.java | 36 ++++ .../service/impl/OrganizationServiceImpl.java | 36 ++++ .../service/impl/UnitDictServiceImpl.java | 36 ++++ .../whdc/service/impl/UserServiceImpl.java | 36 ++++ .../service/impl/VersionsServiceImpl.java | 71 +++++++ src/main/resources/mapper/AbUdRMapper.xml | 13 ++ .../resources/mapper/AddressBookMapper.xml | 29 +++ src/main/resources/mapper/AdinfoMapper.xml | 51 +++++ src/main/resources/mapper/ERuleMapper.xml | 25 --- .../resources/mapper/EStationRulesMapper.xml | 40 ---- src/main/resources/mapper/FcMapper.xml | 13 ++ src/main/resources/mapper/LoginInfoMapper.xml | 13 ++ .../resources/mapper/OrganizationMapper.xml | 13 ++ src/main/resources/mapper/UnitDictMapper.xml | 13 ++ src/main/resources/mapper/UserMapper.xml | 13 ++ src/main/resources/mapper/VersionsMapper.xml | 13 ++ 73 files changed, 2460 insertions(+), 1020 deletions(-) rename src/main/java/com/whdc/{RuleApiApplication.java => FxkhTxlApiApplication.java} (90%) create mode 100644 src/main/java/com/whdc/controller/AbUdRController.java create mode 100644 src/main/java/com/whdc/controller/AddressBookController.java create mode 100644 src/main/java/com/whdc/controller/AdinfoController.java delete mode 100644 src/main/java/com/whdc/controller/ERuleController.java delete mode 100644 src/main/java/com/whdc/controller/EStationRulesController.java create mode 100644 src/main/java/com/whdc/controller/FcController.java create mode 100644 src/main/java/com/whdc/controller/LoginInfoController.java create mode 100644 src/main/java/com/whdc/controller/OrganizationController.java create mode 100644 src/main/java/com/whdc/controller/UnitDictController.java create mode 100644 src/main/java/com/whdc/controller/UserController.java create mode 100644 src/main/java/com/whdc/controller/VersionsController.java create mode 100644 src/main/java/com/whdc/model/dto/AddressBootDto.java delete mode 100644 src/main/java/com/whdc/model/dto/ERuleDto.java delete mode 100644 src/main/java/com/whdc/model/dto/FindRuleDto.java delete mode 100644 src/main/java/com/whdc/model/dto/FindStationDto.java delete mode 100644 src/main/java/com/whdc/model/entity/ERule.java create mode 100644 src/main/java/com/whdc/model/enums/VersionsType.java create mode 100644 src/main/java/com/whdc/model/vo/AdcdTree.java delete mode 100644 src/main/java/com/whdc/model/vo/ERuleVo.java delete mode 100644 src/main/java/com/whdc/model/vo/EStationRulesVo.java delete mode 100644 src/main/java/com/whdc/model/vo/ValidateVo.java create mode 100644 src/main/java/com/whdc/service/IAbUdRService.java create mode 100644 src/main/java/com/whdc/service/IAddressBookService.java create mode 100644 src/main/java/com/whdc/service/IAdinfoService.java delete mode 100644 src/main/java/com/whdc/service/IERuleService.java delete mode 100644 src/main/java/com/whdc/service/IEStationRulesService.java create mode 100644 src/main/java/com/whdc/service/IFcService.java create mode 100644 src/main/java/com/whdc/service/ILoginInfoService.java create mode 100644 src/main/java/com/whdc/service/IOrganizationService.java create mode 100644 src/main/java/com/whdc/service/IUnitDictService.java create mode 100644 src/main/java/com/whdc/service/IUserService.java create mode 100644 src/main/java/com/whdc/service/IVersionsService.java create mode 100644 src/main/java/com/whdc/service/impl/AbUdRServiceImpl.java create mode 100644 src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java create mode 100644 src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java delete mode 100644 src/main/java/com/whdc/service/impl/ERuleServiceImpl.java delete mode 100644 src/main/java/com/whdc/service/impl/EStationRulesServiceImpl.java create mode 100644 src/main/java/com/whdc/service/impl/FcServiceImpl.java create mode 100644 src/main/java/com/whdc/service/impl/LoginInfoServiceImpl.java create mode 100644 src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java create mode 100644 src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java create mode 100644 src/main/java/com/whdc/service/impl/UserServiceImpl.java create mode 100644 src/main/java/com/whdc/service/impl/VersionsServiceImpl.java create mode 100644 src/main/resources/mapper/AbUdRMapper.xml create mode 100644 src/main/resources/mapper/AddressBookMapper.xml create mode 100644 src/main/resources/mapper/AdinfoMapper.xml delete mode 100644 src/main/resources/mapper/ERuleMapper.xml delete mode 100644 src/main/resources/mapper/EStationRulesMapper.xml create mode 100644 src/main/resources/mapper/FcMapper.xml create mode 100644 src/main/resources/mapper/LoginInfoMapper.xml create mode 100644 src/main/resources/mapper/OrganizationMapper.xml create mode 100644 src/main/resources/mapper/UnitDictMapper.xml create mode 100644 src/main/resources/mapper/UserMapper.xml create mode 100644 src/main/resources/mapper/VersionsMapper.xml diff --git a/src/main/java/com/whdc/RuleApiApplication.java b/src/main/java/com/whdc/FxkhTxlApiApplication.java similarity index 90% rename from src/main/java/com/whdc/RuleApiApplication.java rename to src/main/java/com/whdc/FxkhTxlApiApplication.java index c8d3173..9d3ffe9 100644 --- a/src/main/java/com/whdc/RuleApiApplication.java +++ b/src/main/java/com/whdc/FxkhTxlApiApplication.java @@ -21,11 +21,11 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; @EnableScheduling @SpringBootApplication @MapperScan("com.whdc.mapper") -public class RuleApiApplication { +public class FxkhTxlApiApplication { public static void main(String[] args) { try { - SpringApplication.run(RuleApiApplication.class, args); + SpringApplication.run(FxkhTxlApiApplication.class, args); System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>> 启动完成 <<<<<<<<<<<<<<<<<<<<<<<<<<<"); } catch (BeansException e) { diff --git a/src/main/java/com/whdc/controller/AbUdRController.java b/src/main/java/com/whdc/controller/AbUdRController.java new file mode 100644 index 0000000..bceccb0 --- /dev/null +++ b/src/main/java/com/whdc/controller/AbUdRController.java @@ -0,0 +1,100 @@ +package com.whdc.controller; + + +import com.whdc.model.entity.AbUdR; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import com.whdc.service.IAbUdRService; +import com.whdc.utils.ResultJson; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Objects; + +/** + * @author xusan + * @date 2024-05-11 + */ +@Slf4j +@Api(tags = "用户单位字典关联表 - Controller") +@RestController +@RequestMapping("/abudr") +public class AbUdRController { + + @Autowired + private IAbUdRService service; + + + + @ApiOperation(value = "查询所有") + @PostMapping(value = "find") + public ResultJson find(@RequestBody AbUdR dto) { + + return ResultJson.ok(service.find(dto)); + + } + + @ApiOperation(value = "分页查询") + @PostMapping(value = "page") + public ResultJson page(@RequestBody AbUdR dto) { + + return ResultJson.ok(service.page(dto)); + + } + + + @ApiOperation(value = "添加") + @PostMapping(value = "save") + public ResultJson insert(@RequestBody @Validated(Insert.class) AbUdR model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(AbUdR::getAdId,String.valueOf(model.getAdId()).trim()) + .eq(AbUdR::getDictId,String.valueOf(model.getDictId() ).trim()) + .list()) + ){ + return ResultJson.error("重复新增"); + } + + return ResultJson.ok(service.save(model)); + + } + + @ApiOperation(value = "修改") + @PostMapping(value = "edit") + public ResultJson update(@RequestBody @Validated(Update.class) AbUdR model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(AbUdR::getAdId,String.valueOf(model.getAdId()).trim()) + .eq(AbUdR::getDictId,String.valueOf(model.getDictId() ).trim()) + .list()) + ){ + return ResultJson.error("重复修改"); + } + + return ResultJson.ok(service.updateById(model)); + } + + + @ApiOperation(value = "删除") + @GetMapping(value = "del/{id}") + public ResultJson delete(@PathVariable("id") Integer id) { + + + if (Objects.isNull(service.getById(id))) { + + return ResultJson.error("当前数据不存在"); + + } + + return ResultJson.ok(service.removeById(id)); + + } + +} diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java new file mode 100644 index 0000000..91b4924 --- /dev/null +++ b/src/main/java/com/whdc/controller/AddressBookController.java @@ -0,0 +1,184 @@ +package com.whdc.controller; + + +import com.whdc.model.dto.AddressBootDto; +import com.whdc.model.entity.AddressBook; +import com.whdc.model.enums.VersionsType; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import com.whdc.service.IAddressBookService; +import com.whdc.service.IVersionsService; +import com.whdc.utils.ResultJson; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Objects; + +/** + * @author xusan + * @date 2024-05-11 + */ +@Slf4j +@Api(tags = "通讯录 - Controller") +@RestController +@RequestMapping("/addressbook") +public class AddressBookController { + + @Autowired + private IAddressBookService service; + + @Autowired + private IVersionsService versionsService; + + + +// @ApiOperation(value = "查询所有") +// @PostMapping(value = "find") +// public ResultJson find(@RequestBody AddressBook dto) { +// +// return ResultJson.ok(service.find(dto)); +// +// } + + @ApiOperation(value = "分页查询") + @PostMapping(value = "page") + public ResultJson page(@RequestBody AddressBootDto dto) { + + return ResultJson.ok(service.page(dto)); + + } + + + @ApiOperation(value = "添加") + @PostMapping(value = "save") + public ResultJson insert(@RequestBody @Validated(Insert.class) AddressBook model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(AddressBook::getName,String.valueOf(model.getName()).trim()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + // 添加日志 + versionsService.saveInfo(model,VersionsType.ADD); +// versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),null,model.getCreateId(),new Date(), VersionsType.ADD.getName())); + + return ResultJson.ok(service.save(model)); + + } + + @ApiOperation(value = "修改") + @PostMapping(value = "edit") + public ResultJson update(@RequestBody @Validated(Update.class) AddressBook model) { + + AddressBook byId = service.getById(model.getId()); + if (Objects.isNull(byId)){ + return ResultJson.error("当前数据不存在"); + } + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(AddressBook::getName,String.valueOf(model.getName()).trim()) + .ne(AddressBook::getId, model.getId()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + +// List list = versionsService.lambdaQuery() +// .eq(Versions::getAbId, model.getId()) +// .list(); +// Integer version = 0; +// if (CollectionUtils.isNotEmpty(list)){ +// version = list +// .stream().map(Versions::getVersion) +// .max(Comparator.comparing(Integer::intValue)) +// .get(); +// }else{ +// log.info("当前数据在进行修改但无相关记录；" + model.getId()); +// } +// // 添加日志 +// versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.UPDATE.getName())); + versionsService.saveInfo(model,VersionsType.UPDATE); + + // 不修改角色 + model.setRole(byId.getRole()); + return ResultJson.ok(service.updateById(model)); + } + + @ApiOperation(value = "修改权限") + @PostMapping(value = "edit") + public ResultJson updateRole(@RequestBody @Validated(Update.class) AddressBook model) { + + AddressBook byId = service.getById(model.getId()); + if (Objects.isNull(byId)){ + return ResultJson.error("当前数据不存在"); + } + + +// List list = versionsService.lambdaQuery() +// .eq(Versions::getAbId, model.getId()) +// .list(); +// Integer version = 0; +// if (CollectionUtils.isNotEmpty(list)){ +// version = list +// .stream().map(Versions::getVersion) +// .max(Comparator.comparing(Integer::intValue)) +// .get(); +// }else{ +// log.info("当前数据在进行修改但无相关记录；" + model.getId()); +// } +// // 添加日志 +// versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.UPDATE_ROLE.getName())); + versionsService.saveInfo(model,VersionsType.UPDATE_ROLE); + + + // 只修改角色 + boolean update = service.lambdaUpdate().set(AddressBook::getRole, model.getRole()) + .eq(AddressBook::getId, model.getId()) + .update(); + return ResultJson.ok(update); + } + + + @ApiOperation(value = "删除") + @GetMapping(value = "del/{id}") + public ResultJson delete(@PathVariable("id") Integer id) { + + + AddressBook model = service.getById(id); + if (Objects.isNull(model)) { + + return ResultJson.error("当前数据不存在"); + + } + + +// List list = versionsService.lambdaQuery() +// .eq(Versions::getAbId, model.getId()) +// .list(); +// Integer version = 0; +// if (CollectionUtils.isNotEmpty(list)){ +// version = list +// .stream().map(Versions::getVersion) +// .max(Comparator.comparing(Integer::intValue)) +// .get(); +// }else{ +// log.info("当前数据在进行修改但无相关记录；" + model.getId()); +// } +// // 添加日志 +// versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.DEL.getName())); + versionsService.saveInfo(model,VersionsType.DEL); + + + return ResultJson.ok(service.removeById(id)); + } + +} diff --git a/src/main/java/com/whdc/controller/AdinfoController.java b/src/main/java/com/whdc/controller/AdinfoController.java new file mode 100644 index 0000000..2ab14a1 --- /dev/null +++ b/src/main/java/com/whdc/controller/AdinfoController.java @@ -0,0 +1,122 @@ +package com.whdc.controller; + + +import com.whdc.model.entity.Adinfo; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import com.whdc.model.vo.AdcdTree; +import com.whdc.service.IAdinfoService; +import com.whdc.utils.ResultJson; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * @author xusan + * @date 2024-05-11 + */ +@Slf4j +@Api(tags = "行政区划基础信息 - Controller") +@RestController +@RequestMapping("/adinfo") +public class AdinfoController { + + @Autowired + private IAdinfoService service; + + + + @ApiOperation(value = "查询所有") + @PostMapping(value = "find") + public ResultJson find(@RequestBody Adinfo dto) { + + return ResultJson.ok(service.find(dto)); + + } + + @ApiOperation(value = "分页查询") + @PostMapping(value = "page") + public ResultJson page(@RequestBody Adinfo dto) { + + return ResultJson.ok(service.page(dto)); + + } + + + @GetMapping("/tree/{adcdOradnm}") + @ApiOperation(value = "树型查询") + public ResultJson> tree(@PathVariable("adcdOradnm") + @ApiParam(value = "编码或名称,all: 查询全部") + String adcdOradnm) { + + // 查询全部标识 + if ("all".equals(adcdOradnm)) { + adcdOradnm = null; + } + + List list = service.tree(adcdOradnm, adcdOradnm); + return ResultJson.ok(list); + + } + + + @ApiOperation(value = "添加") + @PostMapping(value = "save") + public ResultJson insert(@RequestBody @Validated(Insert.class) Adinfo model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(Adinfo::getAdcd,String.valueOf(model.getAdcd()).trim()) + .or() + .eq(Adinfo::getAdnm,String.valueOf(model.getAdnm()).trim()) + .list()) + ){ + return ResultJson.error("该名称或编码重复"); + } + + return ResultJson.ok(service.save(model)); + + } + + @ApiOperation(value = "修改") + @PostMapping(value = "edit") + public ResultJson update(@RequestBody @Validated(Update.class) Adinfo model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(Adinfo::getAdcd,String.valueOf(model.getAdcd()).trim()) + .or() + .eq(Adinfo::getAdnm,String.valueOf(model.getAdnm()).trim()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + return ResultJson.ok(service.updateById(model)); + } + + + @ApiOperation(value = "删除") + @GetMapping(value = "del/{id}") + public ResultJson delete(@PathVariable("id") Integer id) { + + + if (Objects.isNull(service.getById(id))) { + + return ResultJson.error("当前数据不存在"); + + } + + return ResultJson.ok(service.removeById(id)); + + } + +} diff --git a/src/main/java/com/whdc/controller/ERuleController.java b/src/main/java/com/whdc/controller/ERuleController.java deleted file mode 100644 index 5830491..0000000 --- a/src/main/java/com/whdc/controller/ERuleController.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.whdc.controller; - - -import com.whdc.model.dto.FindRuleDto; -import com.whdc.model.entity.ERule; -import com.whdc.model.entity.EStationRules; -import com.whdc.model.group.Insert; -import com.whdc.model.group.Update; -import com.whdc.service.IERuleService; -import com.whdc.service.IEStationRulesService; -import com.whdc.utils.ResultJson; -import com.whdc.valid.bean.ItemType; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Objects; - -/** - * @author xusan - * @since 2023-03-19 - */ -@Slf4j -@Api(tags = "规则管理 - Controller") -@RestController -@RequestMapping("/eRule") -public class ERuleController { - - @Autowired - private IERuleService ieRuleService; - - @Autowired - private IEStationRulesService ieStationRulesService; - - - @ApiOperation(value = "查询所有") - @PostMapping(value = "list") - public ResultJson list() { - - return ResultJson.ok(ieRuleService.list()); - - } - - @ApiOperation(value = "分页查询") - @PostMapping(value = "page") - public ResultJson page(@RequestBody FindRuleDto ruleDto) { - - return ResultJson.ok(ieRuleService.page(ruleDto)); - - } - - - @ApiOperation(value = "添加") - @PostMapping(value = "save") - public ResultJson insert(@RequestBody @Validated(Insert.class) ERule model) { - - if (CollectionUtils.isNotEmpty( - ieRuleService.lambdaQuery() - .eq(ERule::getName,String.valueOf(model.getName()).trim()) - .list()) - ){ - return ResultJson.error("该名称重复"); - } - - if ( - Objects.isNull(model.getDiffMax()) - && Objects.isNull(model.getMin()) - && Objects.isNull(model.getMax()) - && Objects.isNull(model.getDuration()) - && Objects.isNull(model.getLagTime()) - && Objects.isNull(model.getLeadingTime()) - ){ - return ResultJson.error("请设置规则"); - } - - if (!ItemType.map().containsKey(model.getItem())) { - return ResultJson.error("规则类型不存在"); - } - - return ResultJson.ok(ieRuleService.save(model)); - - } - - @ApiOperation(value = "修改") - @PostMapping(value = "edit") - public ResultJson update(@RequestBody @Validated(Update.class) ERule model) { - - if (CollectionUtils.isNotEmpty( - ieRuleService.lambdaQuery() - .eq(ERule::getName,String.valueOf(model.getName()).trim()) - .ne(ERule::getId, model.getId()) - .list()) - ){ - return ResultJson.error("该名称重复"); - } - - return ResultJson.ok(ieRuleService.updateById(model)); - } - - - @ApiOperation(value = "删除") - @GetMapping(value = "del/{id}") - public ResultJson delete(@PathVariable("id") Integer id) { - - - if (Objects.isNull(ieRuleService.getById(id))) { - - return ResultJson.error("当前数据不存在"); - - } - - if (!ieStationRulesService.lambdaUpdate() - .set(EStationRules::getDel,"0") - .eq(EStationRules::getRuleId,id) - .update()) { - - log.info("规则关联删除失败"); - - } - - return ResultJson.ok(ieRuleService.removeById(id)); - - } - - - @ApiOperation(value = "获取规则类型") - @GetMapping(value = "getItem") - public ResultJson getItem() { - return ResultJson.ok(ItemType.list()); - } - - - -} diff --git a/src/main/java/com/whdc/controller/EStationRulesController.java b/src/main/java/com/whdc/controller/EStationRulesController.java deleted file mode 100644 index f4b3d91..0000000 --- a/src/main/java/com/whdc/controller/EStationRulesController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.whdc.controller; - - -import com.whdc.model.dto.ERuleDtoTest; -import com.whdc.model.dto.FindStationDto; -import com.whdc.model.entity.EStationRules; -import com.whdc.model.group.Insert; -import com.whdc.model.group.Update; -import com.whdc.service.IERuleService; -import com.whdc.service.IEStationRulesService; -import com.whdc.utils.ResultJson; -import com.whdc.valid.service.ValidateService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Objects; - -/** - * @author xusan - * @since 2023-03-19 - */ -@Api(tags = "站点规则管理 - Controller") -@RestController -@RequestMapping("/eStationRule") -public class EStationRulesController { - - @Autowired - private IEStationRulesService ieStationRulesService; - - @Autowired - private IERuleService ieruleService; - - - @ApiOperation(value = "查询全部") - @PostMapping(value = "find") - public ResultJson find(@RequestBody FindStationDto eStationRules) { - return ResultJson.ok(ieStationRulesService.find(eStationRules)); - } - - @ApiOperation(value = "分页查询") - @PostMapping(value = "page") - public ResultJson page(@RequestBody FindStationDto eStationRules) { - return ResultJson.ok(ieStationRulesService.page(eStationRules)); - } - - @ApiOperation(value = "新增测站规则") - @PostMapping(value = "save") - public ResultJson bind(@RequestBody @Validated({Insert.class}) EStationRules eStationRules) { - - if (Objects.isNull(ieruleService.getById(eStationRules.getRuleId()))) { - return ResultJson.error("当前规则不存在"); - } - - if (CollectionUtils.isNotEmpty( - ieStationRulesService.lambdaQuery() - .eq(EStationRules::getStcd,eStationRules.getStcd()) - .eq(EStationRules::getRuleId,eStationRules.getRuleId()) - .list() - )){ - return ResultJson.error("当前规则和测站已绑定"); - } - - return ResultJson.ok(ieStationRulesService.save(eStationRules)); - - } - - @ApiOperation(value = "修改测站规则") - @PostMapping(value = "update") - public ResultJson bindUpdate(@RequestBody @Validated({Update.class}) EStationRules eStationRules) { - - if (Objects.isNull(ieStationRulesService.getById(eStationRules.getId()))) { - - return ResultJson.error("当前数据不存在"); - - } - - if (Objects.isNull(ieruleService.getById(eStationRules.getRuleId()))) { - return ResultJson.error("当前规则不存在"); - } - -// if (CollectionUtils.isNotEmpty( -// ieStationRulesService.lambdaQuery() -// .eq(EStationRules::getStcd,eStationRules.getStcd()) -// .eq(EStationRules::getRuleId,eStationRules.getRuleId()) -// .ne(EStationRules::getId,eStationRules.getId()) -// .list() -// )){ -// return ResultJson.error("当前规则和测站已绑定"); -// } - - return ResultJson.ok(ieStationRulesService.updateById(eStationRules)); - - } - - - @ApiOperation(value = "删除") - @GetMapping(value = "del/{id}") - public ResultJson del(@PathVariable Integer id) { - - EStationRules model = ieStationRulesService.getById(id); - if (Objects.isNull(model)) { - - return ResultJson.error("当前数据不存在"); - - } - - return ResultJson.ok(ieStationRulesService.removeById(id,model)); - } - - @Autowired - private ValidateService validateService; - - @ApiOperation(value = "规则测试 ") - @PostMapping(value = "testRule") - public ResultJson testRule(@RequestBody ERuleDtoTest test) { - return ResultJson.ok(validateService.validate(test.getStr() ,test.getOldStr())); - } - -} diff --git a/src/main/java/com/whdc/controller/FcController.java b/src/main/java/com/whdc/controller/FcController.java new file mode 100644 index 0000000..6381138 --- /dev/null +++ b/src/main/java/com/whdc/controller/FcController.java @@ -0,0 +1,99 @@ +package com.whdc.controller; + + +import com.whdc.model.entity.Fc; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import com.whdc.service.IFcService; +import com.whdc.utils.ResultJson; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Objects; + +/** + * @author xusan + * @date 2024-05-11 + */ +@Slf4j +@Api(tags = "常用联系人 - Controller") +@RestController +@RequestMapping("/fc") +public class FcController { + + @Autowired + private IFcService service; + + + + @ApiOperation(value = "查询所有") + @PostMapping(value = "find") + public ResultJson find(@RequestBody Fc dto) { + + return ResultJson.ok(service.find(dto)); + + } + + @ApiOperation(value = "分页查询") + @PostMapping(value = "page") + public ResultJson page(@RequestBody Fc dto) { + + return ResultJson.ok(service.page(dto)); + + } + + + @ApiOperation(value = "添加") + @PostMapping(value = "save") + public ResultJson insert(@RequestBody @Validated(Insert.class) Fc model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(Fc::getName,String.valueOf(model.getName()).trim()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + return ResultJson.ok(service.save(model)); + + } + + @ApiOperation(value = "修改") + @PostMapping(value = "edit") + public ResultJson update(@RequestBody @Validated(Update.class) Fc model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(Fc::getName,String.valueOf(model.getName()).trim()) + .ne(Fc::getId, model.getId()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + return ResultJson.ok(service.updateById(model)); + } + + + @ApiOperation(value = "删除") + @GetMapping(value = "del/{id}") + public ResultJson delete(@PathVariable("id") Integer id) { + + + if (Objects.isNull(service.getById(id))) { + + return ResultJson.error("当前数据不存在"); + + } + + return ResultJson.ok(service.removeById(id)); + + } + +} diff --git a/src/main/java/com/whdc/controller/LoginInfoController.java b/src/main/java/com/whdc/controller/LoginInfoController.java new file mode 100644 index 0000000..1fe203c --- /dev/null +++ b/src/main/java/com/whdc/controller/LoginInfoController.java @@ -0,0 +1,99 @@ +package com.whdc.controller; + + +import com.whdc.model.entity.LoginInfo; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import com.whdc.service.ILoginInfoService; +import com.whdc.utils.ResultJson; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Objects; + +/** + * @author xusan + * @date 2024-05-11 + */ +@Slf4j +@Api(tags = "登录日志 - Controller") +@RestController +@RequestMapping("/logininfo") +public class LoginInfoController { + + @Autowired + private ILoginInfoService service; + + + + @ApiOperation(value = "查询所有") + @PostMapping(value = "find") + public ResultJson find(@RequestBody LoginInfo dto) { + + return ResultJson.ok(service.find(dto)); + + } + + @ApiOperation(value = "分页查询") + @PostMapping(value = "page") + public ResultJson page(@RequestBody LoginInfo dto) { + + return ResultJson.ok(service.page(dto)); + + } + + + @ApiOperation(value = "添加") + @PostMapping(value = "save") + public ResultJson insert(@RequestBody @Validated(Insert.class) LoginInfo model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(LoginInfo::getName,String.valueOf(model.getName()).trim()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + return ResultJson.ok(service.save(model)); + + } + + @ApiOperation(value = "修改") + @PostMapping(value = "edit") + public ResultJson update(@RequestBody @Validated(Update.class) LoginInfo model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(LoginInfo::getName,String.valueOf(model.getName()).trim()) + .ne(LoginInfo::getId, model.getId()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + return ResultJson.ok(service.updateById(model)); + } + + + @ApiOperation(value = "删除") + @GetMapping(value = "del/{id}") + public ResultJson delete(@PathVariable("id") Integer id) { + + + if (Objects.isNull(service.getById(id))) { + + return ResultJson.error("当前数据不存在"); + + } + + return ResultJson.ok(service.removeById(id)); + + } + +} diff --git a/src/main/java/com/whdc/controller/OrganizationController.java b/src/main/java/com/whdc/controller/OrganizationController.java new file mode 100644 index 0000000..da475d9 --- /dev/null +++ b/src/main/java/com/whdc/controller/OrganizationController.java @@ -0,0 +1,99 @@ +package com.whdc.controller; + + +import com.whdc.model.entity.Organization; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import com.whdc.service.IOrganizationService; +import com.whdc.utils.ResultJson; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Objects; + +/** + * @author xusan + * @date 2024-05-11 + */ +@Slf4j +@Api(tags = "组织表 - Controller") +@RestController +@RequestMapping("/organization") +public class OrganizationController { + + @Autowired + private IOrganizationService service; + + + + @ApiOperation(value = "查询所有") + @PostMapping(value = "find") + public ResultJson find(@RequestBody Organization dto) { + + return ResultJson.ok(service.find(dto)); + + } + + @ApiOperation(value = "分页查询") + @PostMapping(value = "page") + public ResultJson page(@RequestBody Organization dto) { + + return ResultJson.ok(service.page(dto)); + + } + + + @ApiOperation(value = "添加") + @PostMapping(value = "save") + public ResultJson insert(@RequestBody @Validated(Insert.class) Organization model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(Organization::getName,String.valueOf(model.getName()).trim()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + return ResultJson.ok(service.save(model)); + + } + + @ApiOperation(value = "修改") + @PostMapping(value = "edit") + public ResultJson update(@RequestBody @Validated(Update.class) Organization model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(Organization::getName,String.valueOf(model.getName()).trim()) + .ne(Organization::getId, model.getId()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + return ResultJson.ok(service.updateById(model)); + } + + + @ApiOperation(value = "删除") + @GetMapping(value = "del/{id}") + public ResultJson delete(@PathVariable("id") Integer id) { + + + if (Objects.isNull(service.getById(id))) { + + return ResultJson.error("当前数据不存在"); + + } + + return ResultJson.ok(service.removeById(id)); + + } + +} diff --git a/src/main/java/com/whdc/controller/UnitDictController.java b/src/main/java/com/whdc/controller/UnitDictController.java new file mode 100644 index 0000000..23dcbf5 --- /dev/null +++ b/src/main/java/com/whdc/controller/UnitDictController.java @@ -0,0 +1,99 @@ +package com.whdc.controller; + + +import com.whdc.model.entity.UnitDict; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import com.whdc.service.IUnitDictService; +import com.whdc.utils.ResultJson; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Objects; + +/** + * @author xusan + * @date 2024-05-11 + */ +@Slf4j +@Api(tags = "单位字典表 - Controller") +@RestController +@RequestMapping("/unitdict") +public class UnitDictController { + + @Autowired + private IUnitDictService service; + + + + @ApiOperation(value = "查询所有") + @PostMapping(value = "find") + public ResultJson find(@RequestBody UnitDict dto) { + + return ResultJson.ok(service.find(dto)); + + } + + @ApiOperation(value = "分页查询") + @PostMapping(value = "page") + public ResultJson page(@RequestBody UnitDict dto) { + + return ResultJson.ok(service.page(dto)); + + } + + + @ApiOperation(value = "添加") + @PostMapping(value = "save") + public ResultJson insert(@RequestBody @Validated(Insert.class) UnitDict model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(UnitDict::getName,String.valueOf(model.getName()).trim()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + return ResultJson.ok(service.save(model)); + + } + + @ApiOperation(value = "修改") + @PostMapping(value = "edit") + public ResultJson update(@RequestBody @Validated(Update.class) UnitDict model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(UnitDict::getName,String.valueOf(model.getName()).trim()) + .ne(UnitDict::getId, model.getId()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + return ResultJson.ok(service.updateById(model)); + } + + + @ApiOperation(value = "删除") + @GetMapping(value = "del/{id}") + public ResultJson delete(@PathVariable("id") Integer id) { + + + if (Objects.isNull(service.getById(id))) { + + return ResultJson.error("当前数据不存在"); + + } + + return ResultJson.ok(service.removeById(id)); + + } + +} diff --git a/src/main/java/com/whdc/controller/UserController.java b/src/main/java/com/whdc/controller/UserController.java new file mode 100644 index 0000000..d795c56 --- /dev/null +++ b/src/main/java/com/whdc/controller/UserController.java @@ -0,0 +1,99 @@ +package com.whdc.controller; + + +import com.whdc.model.entity.User; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import com.whdc.service.IUserService; +import com.whdc.utils.ResultJson; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Objects; + +/** + * @author xusan + * @date 2024-05-11 + */ +@Slf4j +@Api(tags = "用户表 - Controller") +@RestController +@RequestMapping("/user") +public class UserController { + + @Autowired + private IUserService service; + + + + @ApiOperation(value = "查询所有") + @PostMapping(value = "find") + public ResultJson find(@RequestBody User dto) { + + return ResultJson.ok(service.find(dto)); + + } + + @ApiOperation(value = "分页查询") + @PostMapping(value = "page") + public ResultJson page(@RequestBody User dto) { + + return ResultJson.ok(service.page(dto)); + + } + + + @ApiOperation(value = "添加") + @PostMapping(value = "save") + public ResultJson insert(@RequestBody @Validated(Insert.class) User model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(User::getName,String.valueOf(model.getName()).trim()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + return ResultJson.ok(service.save(model)); + + } + + @ApiOperation(value = "修改") + @PostMapping(value = "edit") + public ResultJson update(@RequestBody @Validated(Update.class) User model) { + + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(User::getName,String.valueOf(model.getName()).trim()) + .ne(User::getId, model.getId()) + .list()) + ){ + return ResultJson.error("该名称重复"); + } + + return ResultJson.ok(service.updateById(model)); + } + + + @ApiOperation(value = "删除") + @GetMapping(value = "del/{id}") + public ResultJson delete(@PathVariable("id") Integer id) { + + + if (Objects.isNull(service.getById(id))) { + + return ResultJson.error("当前数据不存在"); + + } + + return ResultJson.ok(service.removeById(id)); + + } + +} diff --git a/src/main/java/com/whdc/controller/VersionsController.java b/src/main/java/com/whdc/controller/VersionsController.java new file mode 100644 index 0000000..127fbc3 --- /dev/null +++ b/src/main/java/com/whdc/controller/VersionsController.java @@ -0,0 +1,48 @@ +package com.whdc.controller; + + +import com.whdc.model.entity.Versions; +import com.whdc.service.IVersionsService; +import com.whdc.utils.ResultJson; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author xusan + * @date 2024-05-11 + */ +@Slf4j +@Api(tags = "通讯录日志 - Controller") +@RestController +@RequestMapping("/versions") +public class VersionsController { + + @Autowired + private IVersionsService service; + + + + @ApiOperation(value = "查询所有") + @PostMapping(value = "find") + public ResultJson find(@RequestBody Versions dto) { + + return ResultJson.ok(service.find(dto)); + + } + + @ApiOperation(value = "分页查询") + @PostMapping(value = "page") + public ResultJson page(@RequestBody Versions dto) { + + return ResultJson.ok(service.page(dto)); + + } + + +} diff --git a/src/main/java/com/whdc/mapper/AbUdRMapper.java b/src/main/java/com/whdc/mapper/AbUdRMapper.java index f2073bb..7952aca 100644 --- a/src/main/java/com/whdc/mapper/AbUdRMapper.java +++ b/src/main/java/com/whdc/mapper/AbUdRMapper.java @@ -1,10 +1,20 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import com.whdc.model.entity.AbUdR; -public interface AbUdRMapper extends BaseMapper { - int insert(AbUdR record); - int insertSelective(AbUdR record); -} \ No newline at end of file +import java.util.List; +/** + * @author xusan + * @date 2024-05-11 + */ +public interface AbUdRMapper extends BaseMapper { + + IPage page(@Param("page") IPage page, @Param("dto") AbUdR dto); + + List find(@Param("dto") AbUdR dto); + + } \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/AddressBookMapper.java b/src/main/java/com/whdc/mapper/AddressBookMapper.java index 620bf59..63e944d 100644 --- a/src/main/java/com/whdc/mapper/AddressBookMapper.java +++ b/src/main/java/com/whdc/mapper/AddressBookMapper.java @@ -1,18 +1,20 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.whdc.model.dto.AddressBootDto; import com.whdc.model.entity.AddressBook; +import org.apache.ibatis.annotations.Param; +import java.util.List; +/** + * @author xusan + * @date 2024-05-11 + */ public interface AddressBookMapper extends BaseMapper { - int deleteByPrimaryKey(Integer id); - int insert(AddressBook record); + IPage page(@Param("page") IPage page, @Param("dto") AddressBootDto dto); - int insertSelective(AddressBook record); - - AddressBook selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(AddressBook record); - - int updateByPrimaryKey(AddressBook record); -} \ No newline at end of file + List find(@Param("dto") AddressBook dto); + + } \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/AdinfoMapper.java b/src/main/java/com/whdc/mapper/AdinfoMapper.java index ada9613..bcd46c4 100644 --- a/src/main/java/com/whdc/mapper/AdinfoMapper.java +++ b/src/main/java/com/whdc/mapper/AdinfoMapper.java @@ -1,18 +1,21 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import com.whdc.model.entity.Adinfo; -public interface AdinfoMapper extends BaseMapper { - int deleteByPrimaryKey(String adcd); - int insert(Adinfo record); +import java.util.List; +/** + * @author xusan + * @date 2024-05-11 + */ +public interface AdinfoMapper extends BaseMapper { - int insertSelective(Adinfo record); + IPage page(@Param("page") IPage page, @Param("dto") Adinfo dto); - Adinfo selectByPrimaryKey(String adcd); + List find(@Param("dto") Adinfo dto); - int updateByPrimaryKeySelective(Adinfo record); - - int updateByPrimaryKey(Adinfo record); -} \ No newline at end of file + List selectByCdOrNm(@Param("adcd") String adcd, @Param("adnm")String adnm); + } \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/FcMapper.java b/src/main/java/com/whdc/mapper/FcMapper.java index 3b3e65e..6e596b3 100644 --- a/src/main/java/com/whdc/mapper/FcMapper.java +++ b/src/main/java/com/whdc/mapper/FcMapper.java @@ -1,18 +1,20 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import com.whdc.model.entity.Fc; + +import java.util.List; +/** + * @author xusan + * @date 2024-05-11 + */ public interface FcMapper extends BaseMapper { - int deleteByPrimaryKey(Integer id); - int insert(Fc record); + IPage page(@Param("page") IPage page, @Param("dto") Fc dto); - int insertSelective(Fc record); - - Fc selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(Fc record); - - int updateByPrimaryKey(Fc record); -} \ No newline at end of file + List find(@Param("dto") Fc dto); + + } \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/LoginInfoMapper.java b/src/main/java/com/whdc/mapper/LoginInfoMapper.java index 0cb26d5..ac749a5 100644 --- a/src/main/java/com/whdc/mapper/LoginInfoMapper.java +++ b/src/main/java/com/whdc/mapper/LoginInfoMapper.java @@ -1,18 +1,20 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import com.whdc.model.entity.LoginInfo; + +import java.util.List; +/** + * @author xusan + * @date 2024-05-11 + */ public interface LoginInfoMapper extends BaseMapper { - int deleteByPrimaryKey(Integer id); - int insert(LoginInfo record); + IPage page(@Param("page") IPage page, @Param("dto") LoginInfo dto); - int insertSelective(LoginInfo record); - - LoginInfo selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(LoginInfo record); - - int updateByPrimaryKey(LoginInfo record); -} \ No newline at end of file + List find(@Param("dto") LoginInfo dto); + + } \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/OrganizationMapper.java b/src/main/java/com/whdc/mapper/OrganizationMapper.java index 207ffef..72766de 100644 --- a/src/main/java/com/whdc/mapper/OrganizationMapper.java +++ b/src/main/java/com/whdc/mapper/OrganizationMapper.java @@ -1,18 +1,20 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import com.whdc.model.entity.Organization; + +import java.util.List; +/** + * @author xusan + * @date 2024-05-11 + */ public interface OrganizationMapper extends BaseMapper { - int deleteByPrimaryKey(Integer id); - int insert(Organization record); + IPage page(@Param("page") IPage page, @Param("dto") Organization dto); - int insertSelective(Organization record); - - Organization selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(Organization record); - - int updateByPrimaryKey(Organization record); -} \ No newline at end of file + List find(@Param("dto") Organization dto); + + } \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/UnitDictMapper.java b/src/main/java/com/whdc/mapper/UnitDictMapper.java index 6b8f8ec..8f50759 100644 --- a/src/main/java/com/whdc/mapper/UnitDictMapper.java +++ b/src/main/java/com/whdc/mapper/UnitDictMapper.java @@ -1,19 +1,20 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.whdc.model.entity.Organization; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import com.whdc.model.entity.UnitDict; + +import java.util.List; +/** + * @author xusan + * @date 2024-05-11 + */ public interface UnitDictMapper extends BaseMapper { - int deleteByPrimaryKey(Integer id); - int insert(UnitDict record); + IPage page(@Param("page") IPage page, @Param("dto") UnitDict dto); - int insertSelective(UnitDict record); - - UnitDict selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(UnitDict record); - - int updateByPrimaryKey(UnitDict record); -} \ No newline at end of file + List find(@Param("dto") UnitDict dto); + + } \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/UserMapper.java b/src/main/java/com/whdc/mapper/UserMapper.java index 394a724..b4fe3a5 100644 --- a/src/main/java/com/whdc/mapper/UserMapper.java +++ b/src/main/java/com/whdc/mapper/UserMapper.java @@ -1,19 +1,20 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.whdc.model.entity.UnitDict; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import com.whdc.model.entity.User; + +import java.util.List; +/** + * @author xusan + * @date 2024-05-11 + */ public interface UserMapper extends BaseMapper { - int deleteByPrimaryKey(Integer id); - int insert(User record); + IPage page(@Param("page") IPage page, @Param("dto") User dto); - int insertSelective(User record); - - User selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(User record); - - int updateByPrimaryKey(User record); -} \ No newline at end of file + List find(@Param("dto") User dto); + + } \ No newline at end of file diff --git a/src/main/java/com/whdc/mapper/VersionsMapper.java b/src/main/java/com/whdc/mapper/VersionsMapper.java index 0496be3..8ad76fd 100644 --- a/src/main/java/com/whdc/mapper/VersionsMapper.java +++ b/src/main/java/com/whdc/mapper/VersionsMapper.java @@ -1,18 +1,20 @@ package com.whdc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import com.whdc.model.entity.Versions; + +import java.util.List; +/** + * @author xusan + * @date 2024-05-11 + */ public interface VersionsMapper extends BaseMapper { - int deleteByPrimaryKey(Integer id); - int insert(Versions record); + IPage page(@Param("page") IPage page, @Param("dto") Versions dto); - int insertSelective(Versions record); - - Versions selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(Versions record); - - int updateByPrimaryKey(Versions record); -} \ No newline at end of file + List find(@Param("dto") Versions dto); + + } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/dto/AddressBootDto.java b/src/main/java/com/whdc/model/dto/AddressBootDto.java new file mode 100644 index 0000000..c4b6315 --- /dev/null +++ b/src/main/java/com/whdc/model/dto/AddressBootDto.java @@ -0,0 +1,21 @@ +package com.whdc.model.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author xusan + * @date 2023年3月20日08:57:22 + */ +@Data +public class AddressBootDto extends FindPageDto { + + @ApiModelProperty(value = "用户单位id") + private String dictId; + + @ApiModelProperty(value = "用户名称") + private String name; + + @ApiModelProperty(value = "用户手机号") + private String phone; +} diff --git a/src/main/java/com/whdc/model/dto/ERuleDto.java b/src/main/java/com/whdc/model/dto/ERuleDto.java deleted file mode 100644 index f78e766..0000000 --- a/src/main/java/com/whdc/model/dto/ERuleDto.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.whdc.model.dto; - -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import javax.validation.constraints.Max; -import javax.validation.constraints.NotEmpty; - -/** - * @author xusan - * @date 2023年3月20日08:57:22 - */ -@Data -public class ERuleDto { - - /** - * 主键自增 - */ - @ApiParam(value = "主键自增", required = true, example = "0") - @ApiModelProperty(value = "主键自增", required = true, dataType = "Integer", example = "0") - private Integer id; - - /** - * 规则名称 - */ - @ApiParam(value = "规则名称", required = true, example = "规则名称") - @ApiModelProperty(value = "规则名称", required = true, dataType = "String", example = "规则名称") - @NotEmpty(message = "规则名称不能为空") - @Max(50) - private String name; - /** - * 1:正常值范围规则 - * 2:最大差值规则 - */ - @ApiParam(value = "1:正常值范围规则 2:最大差值规则", required = false, example = "1:正常值范围规则 2:最大差值规则 ") - @ApiModelProperty(value = "1:正常值范围规则 2:最大差值规则, required = false ", dataType = "String", example = " 1:正常值范围规则 2:最大差值规则 ") - @NotEmpty(message = "规则类型不能为空") - private String ruleType; - - /** - * 测站类型 - */ - @ApiParam(value = "测站类型", required = true, example = "测站类型") - @ApiModelProperty(value = "测站类型", required = true, dataType = "String", example = "测站类型") - @NotEmpty(message = "测站类型不能为空") - @Max(2) - private String type; - - /** - * 最小值 - */ - @ApiParam(value = "最小值", required = false, example = "最小值") - @ApiModelProperty(value = "最小值", required = false, dataType = "String", example = "最小值") - @Max(100) - private String min; - /** - * 最大值 - */ - @ApiParam(value = "最大值", required = false, example = "最大值") - @ApiModelProperty(value = "最大值", required = false, dataType = "String", example = "最大值") - @Max(100) - private String max; - - /** - * 两条数据之间的差值 - */ - @ApiParam(value = "两条数据之间的差值", required = false, example = "两条数据之间的差值") - @ApiModelProperty(value = "两条数据之间的差值", required = false, dataType = "String", example = "两条数据之间的差值") - @Max(100) - private String lastDataMax; -} diff --git a/src/main/java/com/whdc/model/dto/FindRuleDto.java b/src/main/java/com/whdc/model/dto/FindRuleDto.java deleted file mode 100644 index 29893e6..0000000 --- a/src/main/java/com/whdc/model/dto/FindRuleDto.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.whdc.model.dto; - -import com.whdc.annotation.DateTimeRange; -import com.whdc.model.group.Find; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Pattern; -import java.util.concurrent.TimeUnit; - -/** - * @author xusan - * @date 2023年3月20日08:57:22 - */ -@Data -@DateTimeRange(message = "时间间隔不能超过 31 天", startField = "stm", endField = "etm", interval = 31, timeUnit = TimeUnit.DAYS) -public class FindRuleDto extends FindPageDto { - - @ApiModelProperty(value = "规则名称", dataType = "java.lang.String") - private String name; - - @ApiModelProperty(value = "规则类型", dataType = "java.lang.String") - private String item; - - @ApiModelProperty(value = "起始时间", example = "2023-03-20 10:00:00") - @NotEmpty(message = "起始时间不能为空", groups = Find.class) - @Pattern(regexp = "^[1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\\s+(20|21|22|23|[0-1]\\d):[0-5]\\d:[0-5]\\d$", - message = "时间格式应为：yyyy-MM-dd HH:mm:ss", groups = Find.class) - private String stm; - - @ApiModelProperty(value = "截止时间", example = "2023-03-20 10:00:00") - @NotEmpty(message = "截止时间不能为空", groups = Find.class) - @Pattern(regexp = "^[1-9]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\\s+(20|21|22|23|[0-1]\\d):[0-5]\\d:[0-5]\\d$", - message = "时间格式应为：yyyy-MM-dd HH:mm:ss", groups = Find.class) - private String etm; - -} diff --git a/src/main/java/com/whdc/model/dto/FindStationDto.java b/src/main/java/com/whdc/model/dto/FindStationDto.java deleted file mode 100644 index 3aa1368..0000000 --- a/src/main/java/com/whdc/model/dto/FindStationDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.whdc.model.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author xusan - * @date 2023年3月20日08:57:22 - */ -@Data -public class FindStationDto extends FindPageDto { - - @ApiModelProperty(value = "规则名称", dataType = "java.lang.String") - private String name; - - @ApiModelProperty(value = "测站编码", dataType = "java.lang.String") - private String stcd; - - @ApiModelProperty(value = "适用测站类型", dataType = "java.lang.String") - private String item; - -} diff --git a/src/main/java/com/whdc/model/entity/AbUdR.java b/src/main/java/com/whdc/model/entity/AbUdR.java index 1f0ec7e..ba05ecf 100644 --- a/src/main/java/com/whdc/model/entity/AbUdR.java +++ b/src/main/java/com/whdc/model/entity/AbUdR.java @@ -1,13 +1,42 @@ package com.whdc.model.entity; +import com.baomidou.mybatisplus.annotation.TableField;import com.baomidou.mybatisplus.annotation.IdType;import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode;import lombok.experimental.Accessors; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull;import java.io.Serializable; +import java.util.Date; import java.math.BigDecimal; import java.util.Date; -public class AbUdR { + +/** + * @author xusan + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(description = "用户单位字典关联表") +@TableName("FXKH_TXL.AB_UD_R") +public class AbUdR extends Model implements Serializable { + private static final long serialVersionUID = 1L; + + @TableField("AD_ID") + @ApiModelProperty(value = "联系人id") private Integer adId; + @TableField("DICT_ID") + @ApiModelProperty(value = "字典id") private Integer dictId; + @TableField("SORT") + @ApiModelProperty(value = "序号") private Integer sort; - } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/AddressBook.java b/src/main/java/com/whdc/model/entity/AddressBook.java index c2b524e..6f1b234 100644 --- a/src/main/java/com/whdc/model/entity/AddressBook.java +++ b/src/main/java/com/whdc/model/entity/AddressBook.java @@ -1,28 +1,87 @@ package com.whdc.model.entity; -public class AddressBook { +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +/** + * @author xusan + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(description = "通讯录") +@TableName("FXKH_TXL.ADDRESS_BOOK") +public class AddressBook extends Model implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "ID",type = IdType.AUTO) + @ApiModelProperty(value = "id") + @NotNull(message = "id不能为空" , groups = {Update.class}) private Integer id; + + @NotEmpty(message = "姓名不能为空", groups = {Insert.class,Update.class}) + @TableField("NAME") + @ApiModelProperty(value = "姓名") private String name; + @TableField("PHONE") + @ApiModelProperty(value = "手机号") private String phone; + @TableField("TEL") + @ApiModelProperty(value = "电话") private String tel; + @TableField("FAXES") + @ApiModelProperty(value = "传真") private String faxes; + @TableField("ORGANIZATION") + @ApiModelProperty(value = "组织") private String organization; + @TableField("POSITION") + @ApiModelProperty(value = "职务") private String position; + @TableField("COMMENTS") + @ApiModelProperty(value = "备注") private String comments; + @TableField("URL") + @ApiModelProperty(value = "图片路径") private String url; + @TableField("SORT") + @ApiModelProperty(value = "序号") private Integer sort; + @TableField("V") + @ApiModelProperty(value = "版本") private Integer v; + @TableField("ROLE") + @ApiModelProperty(value = "0:普通管理员,1:政区管理员,99:系统管理员") private String role; + @TableField(exist = false) + @ApiModelProperty(value = "创建人id") + private String createId; } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/Adinfo.java b/src/main/java/com/whdc/model/entity/Adinfo.java index 6b1028a..d25ee1e 100644 --- a/src/main/java/com/whdc/model/entity/Adinfo.java +++ b/src/main/java/com/whdc/model/entity/Adinfo.java @@ -1,26 +1,39 @@ package com.whdc.model.entity; -import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; -public class Adinfo { +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; + + +/** + * @author xusan + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(description = "行政区划基础信息") +@TableName("FXKH_TXL.ADINFO") +public class Adinfo extends Model implements Serializable { + private static final long serialVersionUID = 1L; + + @NotEmpty(message = "政区编码不能为空", groups = {Insert.class,Update.class}) + @TableField("ADCD") + @ApiModelProperty(value = "政区编码") private String adcd; + @NotEmpty(message = "政区名称不能为空", groups = {Insert.class,Update.class}) + @TableField("ADNM") + @ApiModelProperty(value = "政区名称") private String adnm; - - private BigDecimal lgtd; - - private BigDecimal lttd; - - private Integer ptcount; - - private Integer hhtcount; - - private Integer htcount; - - private BigDecimal land; - - private BigDecimal pland; - - private Integer ctype; - } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/ERule.java b/src/main/java/com/whdc/model/entity/ERule.java deleted file mode 100644 index e61ef27..0000000 --- a/src/main/java/com/whdc/model/entity/ERule.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.whdc.model.entity; - -import com.baomidou.mybatisplus.annotation.*; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.whdc.model.group.Insert; -import com.whdc.model.group.Update; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.experimental.Accessors; -import org.apache.commons.lang3.StringUtils; - -import javax.validation.constraints.Max; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import java.util.Locale; - -import static com.whdc.model.MyConstant.DEL; -import static com.whdc.model.MyConstant.REC; - -/** - * @author xusan - * @date 2023-03-19 - */ -@Data -@Accessors(chain = true) -@ApiModel(description = "正常范围规则表") -@TableName("SHZH_IOT.E_RULE") -public class ERule extends Model implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 主键自增 - */ - @ApiParam(value = "主键自增", required = true) - @ApiModelProperty(value = "主键自增", required = true, dataType = "Integer") - @TableId(value = "ID", type = IdType.AUTO) - @NotNull(message = "主键不能为空", groups = {Update.class}) - private Integer id; - - /** - * 规则名称 - */ - @ApiParam(value = "规则名称", required = true, example = "") - @ApiModelProperty(value = "规则名称", required = true, dataType = "String") - @TableField(value = "NAME", updateStrategy = FieldStrategy.NOT_EMPTY) - @NotEmpty(message = "规则名称不能为空", groups = {Insert.class,Update.class}) - @Max(50) - private String name; - - /** - * 测站类型 - */ - @ApiParam(value = "规则类型", required = true, example = "") - @ApiModelProperty(value = "规则类型", required = true, dataType = "String") - @TableField(value = "ITEM", updateStrategy = FieldStrategy.IGNORED) - @NotEmpty(message = "规则类型不能为空", groups = {Insert.class,Update.class}) - @Max(50) - private String item; - - public void setItem(String item) { - - if (StringUtils.isNotBlank(item)){ - item = item.toUpperCase(Locale.ROOT); - } - - this.item = item; - } - - /** - * 最小值 - */ - @ApiParam(value = "最小值", required = false, example = "") - @ApiModelProperty(value = "最小值", required = false, dataType = "Numeric") - @TableField(value = "MIN", updateStrategy = FieldStrategy.IGNORED) - @Max(50) - private BigDecimal min; - - /** - * 最大值 - */ - @ApiParam(value = "最大值", required = false, example = "") - @ApiModelProperty(value = "最大值", required = false, dataType = "Numeric") - @TableField(value = "MAX", updateStrategy = FieldStrategy.IGNORED) - @Max(50) - private BigDecimal max; - - /** - * 最大值 - */ - @ApiParam(value = "两条数据之间的最大差值", required = false, example = "") - @ApiModelProperty(value = "两条数据之间的最大差值", required = false, dataType = "Numeric") - @TableField(value = "DIFF_MAX", updateStrategy = FieldStrategy.IGNORED) - private BigDecimal diffMax; - - /** - * 最大值 - */ - @ApiParam(value = "时间段, 单位 s", required = false, example = "") - @ApiModelProperty(value = "时间段, 单位 s", required = false, dataType = "Numeric") - @TableField(value = "DURATION", updateStrategy = FieldStrategy.IGNORED) - @Max(10) - private Integer duration; - - /** - * 接收超出时间,单位: s ,指接收时间超前范围 - */ - @ApiParam(value = "接收超前时间,单位: s ,指接收时间超前范围", required = false, example = "") - @ApiModelProperty(value = "接收超前时间,单位: s ,指接收时间超前范围", required = false, dataType = "Numeric") - @TableField(value = "LEADING_TIME", updateStrategy = FieldStrategy.IGNORED) - @Max(10) - private Integer leadingTime; - - /** - * 接收滞后时间,单位: s ,指接收时间滞后范围 - */ - @ApiParam(value = "接收滞后时间,单位: s ,指接收时间滞后范围", required = false, example = "") - @ApiModelProperty(value = "接收滞后时间,单位: s ,指接收时间滞后范围", required = false, dataType = "Numeric") - @TableField(value = "LAG_TIME", updateStrategy = FieldStrategy.IGNORED) - @Max(10) - private Integer lagTime; - - /** - * 创建时间 - */ - @ApiParam(value = "创建时间", required = false) - @ApiModelProperty(value = "创建时间", required = false, dataType = "Date") - @TableField(value = "CREATETIME", updateStrategy = FieldStrategy.NOT_EMPTY) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createtime; - - /** - * 1: 未删除 0: 删除 - */ - @ApiParam(value = "1: 未删除 0: 删除", required = false, example = "1") - @ApiModelProperty(value = "1: 未删除 0: 删除", required = false, dataType = "String", example = "1") - @TableField(value = "DEL", fill = FieldFill.INSERT, updateStrategy = FieldStrategy.NOT_EMPTY) - @TableLogic(value = REC,delval = DEL) - @Max(2) - private String del; - -} diff --git a/src/main/java/com/whdc/model/entity/Fc.java b/src/main/java/com/whdc/model/entity/Fc.java index 54a0688..32037bc 100644 --- a/src/main/java/com/whdc/model/entity/Fc.java +++ b/src/main/java/com/whdc/model/entity/Fc.java @@ -1,14 +1,54 @@ package com.whdc.model.entity; -public class Fc { +import com.baomidou.mybatisplus.annotation.TableField;import com.baomidou.mybatisplus.annotation.IdType;import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode;import lombok.experimental.Accessors; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull;import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; +import java.util.Date; + + +/** + * @author xusan + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(description = "常用联系人") +@TableName("FXKH_TXL.FC") +public class Fc extends Model implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "ID",type = IdType.AUTO) + @ApiModelProperty(value = "id") + @NotNull(message = "id不能为空" , groups = {Update.class}) private Integer id; + + @NotNull(message = "用户编号不能为空", groups = {Insert.class,Update.class}) + @TableField("USER_ID") + @ApiModelProperty(value = "用户编号") private Integer userId; + @NotNull(message = "通讯录编号不能为空", groups = {Insert.class,Update.class}) + @TableField("AB_ID") + @ApiModelProperty(value = "通讯录编号") private Integer abId; + @TableField("SORT") + @ApiModelProperty(value = "序号") private Integer sort; + @TableField("TYPE") + @ApiModelProperty(value = "0:常用联系人,1:置顶联系人") private String type; - } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/LoginInfo.java b/src/main/java/com/whdc/model/entity/LoginInfo.java index 59e81eb..d2eff16 100644 --- a/src/main/java/com/whdc/model/entity/LoginInfo.java +++ b/src/main/java/com/whdc/model/entity/LoginInfo.java @@ -1,16 +1,53 @@ package com.whdc.model.entity; +import com.baomidou.mybatisplus.annotation.TableField;import com.baomidou.mybatisplus.annotation.IdType;import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode;import lombok.experimental.Accessors; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull;import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; import java.util.Date; -public class LoginInfo { + +/** + * @author xusan + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(description = "登录日志") +@TableName("FXKH_TXL.LOGIN_INFO") +public class LoginInfo extends Model implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "ID",type = IdType.AUTO) + @ApiModelProperty(value = "id") + @NotNull(message = "id不能为空" , groups = {Update.class}) private Integer id; + + @TableField("IP") + @ApiModelProperty(value = "") private String ip; + @TableField("CREATE_ID") + @ApiModelProperty(value = "新增人id") private String createId; + @TableField("CREATE_TIME") + @ApiModelProperty(value = "新增时间") private Date createTime; + @NotEmpty(message = "0:密码登录 1:验证码登录不能为空", groups = {Insert.class,Update.class}) + @TableField("TYPE") + @ApiModelProperty(value = "0:密码登录 1:验证码登录") private String type; - } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/Organization.java b/src/main/java/com/whdc/model/entity/Organization.java index fbcbdc1..d8f35f8 100644 --- a/src/main/java/com/whdc/model/entity/Organization.java +++ b/src/main/java/com/whdc/model/entity/Organization.java @@ -1,14 +1,57 @@ package com.whdc.model.entity; -public class Organization { +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +/** + * @author xusan + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(description = "组织表") +@TableName("FXKH_TXL.ORGANIZATION") +public class Organization extends Model implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "ID",type = IdType.AUTO) + @ApiModelProperty(value = "id") + @NotNull(message = "id不能为空" , groups = {Update.class}) private Integer id; + + @NotEmpty(message = "编号不能为空", groups = {Insert.class,Update.class}) + @TableField("OBJ_ID") + @ApiModelProperty(value = "编号") private String objId; + @NotEmpty(message = "名称不能为空", groups = {Insert.class,Update.class}) + @TableField("NAME") + @ApiModelProperty(value = "名称") private String name; + @TableField("SORT") + @ApiModelProperty(value = "序号") private Integer sort; + @NotEmpty(message = "政区编码不能为空", groups = {Insert.class,Update.class}) + @TableField("ADCD") + @ApiModelProperty(value = "政区编码") private String adcd; - } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/UnitDict.java b/src/main/java/com/whdc/model/entity/UnitDict.java index 2fe083e..236fc6a 100644 --- a/src/main/java/com/whdc/model/entity/UnitDict.java +++ b/src/main/java/com/whdc/model/entity/UnitDict.java @@ -1,12 +1,53 @@ package com.whdc.model.entity; -public class UnitDict { +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + + +/** + * @author xusan + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(description = "单位字典表") +@TableName("FXKH_TXL.UNIT_DICT") +public class UnitDict extends Model implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "ID",type = IdType.AUTO) + @ApiModelProperty(value = "id") + @NotNull(message = "id不能为空" , groups = {Update.class}) private Integer id; + + @NotEmpty(message = "名称不能为空", groups = {Insert.class,Update.class}) + @TableField("NAME") + @ApiModelProperty(value = "名称") private String name; + @NotNull(message = "序号不能为空", groups = {Insert.class,Update.class}) + @TableField("SORT") + @ApiModelProperty(value = "序号") private Integer sort; + @NotEmpty(message = "类型不能为空", groups = {Insert.class,Update.class}) + @TableField("TYPE") + @ApiModelProperty(value = "1:省防指,2: 省防办,3: 省防指成员单位,4: 市、县防指、防办, 5: 主要湖泊及涉湖泵站,6:重要提防,7: 主要蓄滞洪区,8: 大型水库大坝") private String type; - } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/User.java b/src/main/java/com/whdc/model/entity/User.java index 6a0e549..1e03741 100644 --- a/src/main/java/com/whdc/model/entity/User.java +++ b/src/main/java/com/whdc/model/entity/User.java @@ -1,12 +1,49 @@ package com.whdc.model.entity; -public class User { +import com.baomidou.mybatisplus.annotation.TableField;import com.baomidou.mybatisplus.annotation.IdType;import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode;import lombok.experimental.Accessors; +import com.whdc.model.group.Insert; +import com.whdc.model.group.Update; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull;import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; +import java.util.Date; + + +/** + * @author xusan + * @date 2024-05-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(description = "用户表") +@TableName("FXKH_TXL.USER") +public class User extends Model implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "ID",type = IdType.AUTO) + @ApiModelProperty(value = "id") + @NotNull(message = "id不能为空" , groups = {Update.class}) private Integer id; + + @NotEmpty(message = "密码不能为空", groups = {Insert.class,Update.class}) + @TableField("PASSWORD") + @ApiModelProperty(value = "密码") private String password; + @TableField("SALT") + @ApiModelProperty(value = "盐值") private String salt; + @TableField("AB_ID") + @ApiModelProperty(value = "通讯录id") private Integer abId; - } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/entity/Versions.java b/src/main/java/com/whdc/model/entity/Versions.java index a95fd3b..b9fbe0f 100644 --- a/src/main/java/com/whdc/model/entity/Versions.java +++ b/src/main/java/com/whdc/model/entity/Versions.java @@ -1,20 +1,65 @@ package com.whdc.model.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.whdc.model.group.Update; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.Date; -public class Versions { + +/** + * @author xusan + * @date 2024-05-11 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(description = "通讯录操作日志") +@TableName("FXKH_TXL.VERSIONS") +public class Versions extends Model implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(value = "ID",type = IdType.AUTO) + @ApiModelProperty(value = "id") + @NotNull(message = "id不能为空" , groups = {Update.class}) private Integer id; + + @TableField("JSON") + @ApiModelProperty(value = "数据") private String json; + @TableField("AB_ID") + @ApiModelProperty(value = "通讯录编号") private Integer abId; + @TableField("VERSION") + @ApiModelProperty(value = "版本号") private Integer version; + @TableField("CREATE_ID") + @ApiModelProperty(value = "新增人id") private String createId; + @TableField("CREATE_TIME") + @ApiModelProperty(value = "新增时间") private Date createTime; + @TableField("TYPE") + @ApiModelProperty(value = "0:添加用户,1:修改用户,2:修改权限,3:删除用户") private String type; - } \ No newline at end of file diff --git a/src/main/java/com/whdc/model/enums/VersionsType.java b/src/main/java/com/whdc/model/enums/VersionsType.java new file mode 100644 index 0000000..729c877 --- /dev/null +++ b/src/main/java/com/whdc/model/enums/VersionsType.java @@ -0,0 +1,73 @@ +package com.whdc.model.enums; + +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +/** + * @author xusan + * @date 2022/7/14 16:55 + * 通讯录操作类型枚举类 + */ +public enum VersionsType { + + ADD("0", "添加用户"), + UPDATE("1", "修改用户"), + UPDATE_ROLE("2", "修改权限"), + DEL("3", "删除用户"); + + + private String name; + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + private VersionsType(String name, String value) { + this.name = name; + this.value = value; + } + + public static Map map() { + Map map = new HashMap<>(); + VersionsType[] values = VersionsType.values(); + for (VersionsType e : values) { + map.put(e.getValue(), e); + } + return map; + } + + public static Map mapName() { + Map map = new HashMap<>(); + VersionsType[] values = VersionsType.values(); + for (VersionsType e : values) { + map.put(e.getName(), e); + } + return map; + } + + public static VersionsType getByValue(String value) { + if (Objects.isNull(value)) return null; + return map().get(value); + } + + public static VersionsType getByName(String name) { + if (StringUtils.isEmpty(name)) return null; + return mapName().get(name); + } +} diff --git a/src/main/java/com/whdc/model/vo/AdcdTree.java b/src/main/java/com/whdc/model/vo/AdcdTree.java new file mode 100644 index 0000000..e93b81c --- /dev/null +++ b/src/main/java/com/whdc/model/vo/AdcdTree.java @@ -0,0 +1,26 @@ +package com.whdc.model.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +@Data +@Accessors(chain = true) // chain = true 实现链式调用 +public class AdcdTree { + + @ApiModelProperty(value = "行政区划代码") + private String adcd; + + @ApiModelProperty(value = "行政区划名称") + private String adnm; + + @ApiModelProperty(value = "行政区划级别 0省,1市,2县,3镇,4村,5组 ,(点击树查询下级, 点击查询按钮查询本级)", example = "0") + private Integer adlevel; + + @ApiModelProperty("下属行政区") + private List adcdChildren; + + +} diff --git a/src/main/java/com/whdc/model/vo/ERuleVo.java b/src/main/java/com/whdc/model/vo/ERuleVo.java deleted file mode 100644 index d607537..0000000 --- a/src/main/java/com/whdc/model/vo/ERuleVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.whdc.model.vo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * @author 李赛 - * @date 2022-06-26 10:43 - */ -@Data -@Accessors(chain = true) // chain = true 实现链式调用 -@JsonInclude(JsonInclude.Include.NON_NULL) // 表示序列化非null属性 -public class ERuleVo implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - private Integer id; - - @ApiModelProperty(value = "规则id") - private Integer ruleId; - - @ApiModelProperty(value = "规则类型") - private String ruleType; - - -} diff --git a/src/main/java/com/whdc/model/vo/EStationRulesVo.java b/src/main/java/com/whdc/model/vo/EStationRulesVo.java deleted file mode 100644 index 067b821..0000000 --- a/src/main/java/com/whdc/model/vo/EStationRulesVo.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.whdc.model.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author xusan - * @date 2023年3月28日14:07:28 - */ -@Data -@Accessors(chain = true) // chain = true 实现链式调用 -@JsonInclude(JsonInclude.Include.NON_NULL) // 表示序列化非null属性 -public class EStationRulesVo implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "主键id") - private Integer id; - - @ApiModelProperty(value = "规则id") - private Integer ruleId; - - @ApiModelProperty(value = "测站编码") - private String stcd; - - @ApiModelProperty(value = "规则类型") - private String item; - - @ApiModelProperty(value = "规则名称") - private String name; - - @ApiModelProperty(value = "顺序") - private String sort; - - @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createtime; - - -} diff --git a/src/main/java/com/whdc/model/vo/ValidateVo.java b/src/main/java/com/whdc/model/vo/ValidateVo.java deleted file mode 100644 index e98bf58..0000000 --- a/src/main/java/com/whdc/model/vo/ValidateVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.whdc.model.vo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * @author 李赛 - * @date 2022-06-26 10:43 - */ -@Data -@Accessors(chain = true) // chain = true 实现链式调用 -@JsonInclude(JsonInclude.Include.NON_NULL) // 表示序列化非null属性 -public class ValidateVo implements Serializable { - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value = "是否通过 1是可，0是否") - private Integer isPass = 1; - - @ApiModelProperty(value = "提示信息") - private String msg; - - - @ApiModelProperty(value = "验证不通过规则id") - private String npRuleCode; - - - @ApiModelProperty(value = "规则id") - private List ruleCodes = new ArrayList<>(); - -} diff --git a/src/main/java/com/whdc/service/IAbUdRService.java b/src/main/java/com/whdc/service/IAbUdRService.java new file mode 100644 index 0000000..d9f1698 --- /dev/null +++ b/src/main/java/com/whdc/service/IAbUdRService.java @@ -0,0 +1,24 @@ +package com.whdc.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.entity.AbUdR; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * @author xusan + * @date 2024-05-11 + */ +public interface IAbUdRService extends IService { + + // 获取所有规则分页 + IPage page(AbUdR dto); + + // 获取所有规则 + List find(AbUdR dto); + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/IAddressBookService.java b/src/main/java/com/whdc/service/IAddressBookService.java new file mode 100644 index 0000000..671e764 --- /dev/null +++ b/src/main/java/com/whdc/service/IAddressBookService.java @@ -0,0 +1,25 @@ +package com.whdc.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.dto.AddressBootDto; +import com.whdc.model.entity.AddressBook; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * @author xusan + * @date 2024-05-11 + */ +public interface IAddressBookService extends IService { + + // 获取所有规则分页 + IPage page(AddressBootDto dto); + + // 获取所有规则 + List find(AddressBook dto); + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/IAdinfoService.java b/src/main/java/com/whdc/service/IAdinfoService.java new file mode 100644 index 0000000..92769cb --- /dev/null +++ b/src/main/java/com/whdc/service/IAdinfoService.java @@ -0,0 +1,26 @@ +package com.whdc.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.entity.Adinfo; +import com.whdc.model.vo.AdcdTree; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * @author xusan + * @date 2024-05-11 + */ +public interface IAdinfoService extends IService { + + // 获取所有规则分页 + IPage page(Adinfo dto); + + // 获取所有规则 + List find(Adinfo dto); + + List tree(String adcd, String adnm1); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/IERuleService.java b/src/main/java/com/whdc/service/IERuleService.java deleted file mode 100644 index b892ddc..0000000 --- a/src/main/java/com/whdc/service/IERuleService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.whdc.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.whdc.model.dto.FindRuleDto; -import com.whdc.model.entity.ERule; - -/** - *

- * 服务类 - *

- * - * @author xusan - * @since 2023-03-19 - */ -public interface IERuleService extends IService { - /** - * - * @param eData - * @return - */ - IPage page(FindRuleDto eData); - - -} diff --git a/src/main/java/com/whdc/service/IEStationRulesService.java b/src/main/java/com/whdc/service/IEStationRulesService.java deleted file mode 100644 index 2fcd20a..0000000 --- a/src/main/java/com/whdc/service/IEStationRulesService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.whdc.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.whdc.model.dto.FindStationDto; -import com.whdc.model.entity.EStationRules; -import com.whdc.model.vo.EStationRulesVo; - -import java.util.List; - -/** - *

- * 服务类 - *

- * - * @author xusan - * @since 2023-03-19 - */ -public interface IEStationRulesService extends IService { - - // 获取所有规则分页 - IPage page(FindStationDto ruleDto); - - // 获取所有规则 - List find(FindStationDto ruleDto); - - boolean removeById(Integer id, EStationRules model); - - void delRule(Integer eRuleId); -} diff --git a/src/main/java/com/whdc/service/IFcService.java b/src/main/java/com/whdc/service/IFcService.java new file mode 100644 index 0000000..206435a --- /dev/null +++ b/src/main/java/com/whdc/service/IFcService.java @@ -0,0 +1,24 @@ +package com.whdc.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.entity.Fc; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * @author xusan + * @date 2024-05-11 + */ +public interface IFcService extends IService { + + // 获取所有规则分页 + IPage page(Fc dto); + + // 获取所有规则 + List find(Fc dto); + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/ILoginInfoService.java b/src/main/java/com/whdc/service/ILoginInfoService.java new file mode 100644 index 0000000..5433ebe --- /dev/null +++ b/src/main/java/com/whdc/service/ILoginInfoService.java @@ -0,0 +1,24 @@ +package com.whdc.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.entity.LoginInfo; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * @author xusan + * @date 2024-05-11 + */ +public interface ILoginInfoService extends IService { + + // 获取所有规则分页 + IPage page(LoginInfo dto); + + // 获取所有规则 + List find(LoginInfo dto); + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/IOrganizationService.java b/src/main/java/com/whdc/service/IOrganizationService.java new file mode 100644 index 0000000..665beba --- /dev/null +++ b/src/main/java/com/whdc/service/IOrganizationService.java @@ -0,0 +1,24 @@ +package com.whdc.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.entity.Organization; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * @author xusan + * @date 2024-05-11 + */ +public interface IOrganizationService extends IService { + + // 获取所有规则分页 + IPage page(Organization dto); + + // 获取所有规则 + List find(Organization dto); + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/IUnitDictService.java b/src/main/java/com/whdc/service/IUnitDictService.java new file mode 100644 index 0000000..05ebae1 --- /dev/null +++ b/src/main/java/com/whdc/service/IUnitDictService.java @@ -0,0 +1,24 @@ +package com.whdc.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.entity.UnitDict; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * @author xusan + * @date 2024-05-11 + */ +public interface IUnitDictService extends IService { + + // 获取所有规则分页 + IPage page(UnitDict dto); + + // 获取所有规则 + List find(UnitDict dto); + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/IUserService.java b/src/main/java/com/whdc/service/IUserService.java new file mode 100644 index 0000000..f870b8a --- /dev/null +++ b/src/main/java/com/whdc/service/IUserService.java @@ -0,0 +1,24 @@ +package com.whdc.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.entity.User; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * @author xusan + * @date 2024-05-11 + */ +public interface IUserService extends IService { + + // 获取所有规则分页 + IPage page(User dto); + + // 获取所有规则 + List find(User dto); + +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/IVersionsService.java b/src/main/java/com/whdc/service/IVersionsService.java new file mode 100644 index 0000000..007c4e8 --- /dev/null +++ b/src/main/java/com/whdc/service/IVersionsService.java @@ -0,0 +1,27 @@ +package com.whdc.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.whdc.model.entity.AddressBook; +import com.whdc.model.entity.Versions; +import com.whdc.model.enums.VersionsType; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * @author xusan + * @date 2024-05-11 + */ +public interface IVersionsService extends IService { + + // 获取所有规则分页 + IPage page(Versions dto); + + // 获取所有规则 + List find(Versions dto); + + boolean saveInfo(AddressBook model, VersionsType versionsType); +} \ No newline at end of file diff --git a/src/main/java/com/whdc/service/impl/AbUdRServiceImpl.java b/src/main/java/com/whdc/service/impl/AbUdRServiceImpl.java new file mode 100644 index 0000000..2b28a70 --- /dev/null +++ b/src/main/java/com/whdc/service/impl/AbUdRServiceImpl.java @@ -0,0 +1,36 @@ +package com.whdc.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.whdc.mapper.AbUdRMapper; +import com.whdc.model.entity.AbUdR; +import com.whdc.service.IAbUdRService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * @author xusan + * @date 2024-05-11 + */ +@Service +public class AbUdRServiceImpl extends ServiceImpl implements IAbUdRService { + + + @Override + public IPage page(AbUdR dto) { + return baseMapper.page(new Page<>(), dto); + } + + + @Override + public List find(AbUdR dto) { + return baseMapper.find(dto); + } + + + +} diff --git a/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java new file mode 100644 index 0000000..7f27245 --- /dev/null +++ b/src/main/java/com/whdc/service/impl/AddressBookServiceImpl.java @@ -0,0 +1,37 @@ +package com.whdc.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.whdc.mapper.AddressBookMapper; +import com.whdc.model.dto.AddressBootDto; +import com.whdc.model.entity.AddressBook; +import com.whdc.service.IAddressBookService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * @author xusan + * @date 2024-05-11 + */ +@Service +public class AddressBookServiceImpl extends ServiceImpl implements IAddressBookService { + + + @Override + public IPage page(AddressBootDto dto) { + return baseMapper.page(new Page<>(), dto); + } + + + @Override + public List find(AddressBook dto) { + return baseMapper.find(dto); + } + + + +} diff --git a/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java b/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java new file mode 100644 index 0000000..1330c15 --- /dev/null +++ b/src/main/java/com/whdc/service/impl/AdinfoServiceImpl.java @@ -0,0 +1,184 @@ +package com.whdc.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.whdc.mapper.AdinfoMapper; +import com.whdc.model.entity.Adinfo; +import com.whdc.model.vo.AdcdTree; +import com.whdc.service.IAdinfoService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + +/** + *

+ * 服务实现类 + *

+ * @author xusan + * @date 2024-05-11 + */ +@Service +public class AdinfoServiceImpl extends ServiceImpl implements IAdinfoService { + + + @Override + public IPage page(Adinfo dto) { + return baseMapper.page(new Page<>(), dto); + } + + + @Override + public List find(Adinfo dto) { + return baseMapper.find(dto); + } + + + + + /** + * 行政区划树型查询 + * 420116,001,002,000 + * 6位区县，9位街道，12位组 + * 省 市 县 + * 42 28 22 100 011 100 + * + * @param adcd + * @return + */ +// @Cacheable(cacheNames = {REDIS_KEY}, key = "getMethodName()", condition = "#adcd", unless = "false", cacheResolver = "redisExpireCacheResolver") + public List tree(String adcd, String adnm) { + + List list = treeList(adcd, adnm); + + if (CollectionUtils.isNotEmpty(list)){ + list = list.stream().sorted(Comparator.comparing(Adinfo::getAdcd) + .reversed() + ).collect(Collectors.toList()); + } + + // 省 42 2000000000000 + Map province = new HashMap<>(); + + // 市 4205 00000000000 + Map> city = new HashMap<>(); + + // 县 421122 000000000 + Map> county = new HashMap<>(); + + // 镇 421122100 000000 + Map> town = new HashMap<>(); + + // 村 421122100201 000 + Map> village = new HashMap<>(); + + // 组 421122100201100 + Map> group = new HashMap<>(); + + List tree = new ArrayList<>(); + + for (Adinfo adinfo : list) { + String ad = adinfo.getAdcd(); + String nm = adinfo.getAdnm(); + AdcdTree adcdTree = new AdcdTree().setAdcd(ad).setAdnm(nm).setAdcdChildren(new ArrayList<>()); + + // 判断行政区划编码 + String provinceStr = ad.substring(0, 2); + String cityStr = ad.substring(0, 4); + String countyStr = ad.substring(0, 6); + String townStr = ad.substring(0, 9); + String villageStr = ad.substring(0, 12); + + if ("0000000000000".equals(ad.substring(2))) { // 省 + + adcdTree.setAdlevel(0); + adcdTree.setAdcdChildren(city.get(provinceStr)); +// province.put(provinceStr, adcdTree); + tree.add(adcdTree); + + } else if ("00000000000".equals(ad.substring(4))) { // 市 + adcdTree.setAdlevel(1); + adcdTree.setAdcdChildren(county.get(cityStr)); + addTree(city, provinceStr, adcdTree); + + } else if ("000000000".equals(ad.substring(6))) { // 县 + adcdTree.setAdlevel(2); + adcdTree.setAdcdChildren(town.get(countyStr)); + addTree(county, cityStr, adcdTree); + + } else if ("000000".equals(ad.substring(9))) { // 镇 + adcdTree.setAdlevel(3); + adcdTree.setAdcdChildren(village.get(townStr)); + addTree(town, countyStr, adcdTree); + + } else if ("000".equals(ad.substring(12))) { // 村 + adcdTree.setAdlevel(4); + adcdTree.setAdcdChildren(group.get(villageStr)); + addTree(village, townStr, adcdTree); + + } else { // 组 + adcdTree.setAdlevel(5); + adcdTree.setAdcdChildren(null); + addTree(group, villageStr, adcdTree); + } + + } + + // 排序 + + return sorted(tree); + } + + + public List treeList(String adcd, String adnm) { + + if(adcd.endsWith("0000000000000")){ + adcd = adcd.substring(0,2); + } + if (StringUtils.isNotBlank(adcd) && StringUtils.isNotBlank(adnm)) { + + // 需要查出层级数据 + return baseMapper.selectByCdOrNm(adcd, adnm); + + } else { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotBlank(adcd)) { + queryWrapper.like(Adinfo::getAdcd, adcd); + } + List adinfos = baseMapper.selectList(queryWrapper); + + return adinfos; // 查所有 + } + + } + + private List sorted( List tree) { + + List sorteds = null; + + if (CollectionUtils.isNotEmpty(tree)){ + sorteds = tree.stream().sorted(Comparator.comparing(AdcdTree::getAdcd) + ).collect(Collectors.toList()); + sorteds.forEach(o->{ + o.setAdcdChildren(sorted(o.getAdcdChildren())); + }); + } + + return sorteds; + } + + private void addTree(Map> data, String key, AdcdTree tree) { + List trees = data.get(key); + if (CollectionUtils.isEmpty(trees)) { + trees = new ArrayList<>(); + } + trees.add(tree); + + data.put(key, trees); + } + +} diff --git a/src/main/java/com/whdc/service/impl/ERuleServiceImpl.java b/src/main/java/com/whdc/service/impl/ERuleServiceImpl.java deleted file mode 100644 index 45ca55b..0000000 --- a/src/main/java/com/whdc/service/impl/ERuleServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.whdc.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.whdc.mapper.ERuleMapper; -import com.whdc.model.dto.FindRuleDto; -import com.whdc.model.entity.ERule; -import com.whdc.service.IERuleService; -import com.whdc.service.IEStationRulesService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - *

- * 服务实现类 - *

- * - * @author xusan - * @since 2023-03-19 - */ -@Service -public class ERuleServiceImpl extends ServiceImpl implements IERuleService { - - @Autowired - private IEStationRulesService ieStationRulesService; - - @Override - public IPage page(FindRuleDto findDto) { - return baseMapper.page(findDto.getPage(), findDto); - } - - - @Override - public boolean updateById(ERule model){ - - boolean update = super.updateById(model); - if (update){ - ieStationRulesService.delRule(model.getId()); - } - - return update; - } - -} diff --git a/src/main/java/com/whdc/service/impl/EStationRulesServiceImpl.java b/src/main/java/com/whdc/service/impl/EStationRulesServiceImpl.java deleted file mode 100644 index 293e233..0000000 --- a/src/main/java/com/whdc/service/impl/EStationRulesServiceImpl.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.whdc.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.whdc.mapper.EStationRulesMapper; -import com.whdc.model.dto.FindStationDto; -import com.whdc.model.entity.EStationRules; -import com.whdc.model.vo.EStationRulesVo; -import com.whdc.service.IEStationRulesService; -import com.whdc.valid.component.RuleRedisService; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 服务实现类 - *

- * - * @author xusan - * @since 2023-03-19 - */ -@Service -public class EStationRulesServiceImpl extends ServiceImpl implements IEStationRulesService { - - - @Autowired - private RuleRedisService ruleRedis; - - - @Override - public IPage page(FindStationDto ruleDto) { - return baseMapper.page(ruleDto.getPage(), ruleDto); - } - - - @Override - public List find(FindStationDto ruleDto) { - - return baseMapper.find(ruleDto); - } - - - @Override - public boolean updateById(EStationRules model){ - - boolean update = super.updateById(model); - if (update){ - ruleRedis.delRule(model.getStcd()); - } - - return update; - } - - - @Override - public boolean removeById( Integer id,EStationRules model){ - - boolean update = super.removeById(id); - if (update){ - ruleRedis.delRule(model.getStcd()); - } - - return update; - } - - @Override - public void delRule(Integer eRuleId) { - - List list = this.lambdaQuery().eq(EStationRules::getRuleId, eRuleId) - .list(); - if (CollectionUtils.isNotEmpty(list)) { - for (EStationRules rules : list) { - ruleRedis.delRule(rules.getStcd()); - } - } - - } - - -} diff --git a/src/main/java/com/whdc/service/impl/FcServiceImpl.java b/src/main/java/com/whdc/service/impl/FcServiceImpl.java new file mode 100644 index 0000000..bc4fa75 --- /dev/null +++ b/src/main/java/com/whdc/service/impl/FcServiceImpl.java @@ -0,0 +1,36 @@ +package com.whdc.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.whdc.mapper.FcMapper; +import com.whdc.model.entity.Fc; +import com.whdc.service.IFcService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * @author xusan + * @date 2024-05-11 + */ +@Service +public class FcServiceImpl extends ServiceImpl implements IFcService { + + + @Override + public IPage page(Fc dto) { + return baseMapper.page(new Page<>(), dto); + } + + + @Override + public List find(Fc dto) { + return baseMapper.find(dto); + } + + + +} diff --git a/src/main/java/com/whdc/service/impl/LoginInfoServiceImpl.java b/src/main/java/com/whdc/service/impl/LoginInfoServiceImpl.java new file mode 100644 index 0000000..3fcf8e3 --- /dev/null +++ b/src/main/java/com/whdc/service/impl/LoginInfoServiceImpl.java @@ -0,0 +1,36 @@ +package com.whdc.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.whdc.mapper.LoginInfoMapper; +import com.whdc.model.entity.LoginInfo; +import com.whdc.service.ILoginInfoService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * @author xusan + * @date 2024-05-11 + */ +@Service +public class LoginInfoServiceImpl extends ServiceImpl implements ILoginInfoService { + + + @Override + public IPage page(LoginInfo dto) { + return baseMapper.page(new Page<>(), dto); + } + + + @Override + public List find(LoginInfo dto) { + return baseMapper.find(dto); + } + + + +} diff --git a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java new file mode 100644 index 0000000..36e7ff5 --- /dev/null +++ b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java @@ -0,0 +1,36 @@ +package com.whdc.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.whdc.mapper.OrganizationMapper; +import com.whdc.model.entity.Organization; +import com.whdc.service.IOrganizationService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * @author xusan + * @date 2024-05-11 + */ +@Service +public class OrganizationServiceImpl extends ServiceImpl implements IOrganizationService { + + + @Override + public IPage page(Organization dto) { + return baseMapper.page(new Page<>(), dto); + } + + + @Override + public List find(Organization dto) { + return baseMapper.find(dto); + } + + + +} diff --git a/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java b/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java new file mode 100644 index 0000000..09fff7b --- /dev/null +++ b/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java @@ -0,0 +1,36 @@ +package com.whdc.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.whdc.mapper.UnitDictMapper; +import com.whdc.model.entity.UnitDict; +import com.whdc.service.IUnitDictService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * @author xusan + * @date 2024-05-11 + */ +@Service +public class UnitDictServiceImpl extends ServiceImpl implements IUnitDictService { + + + @Override + public IPage page(UnitDict dto) { + return baseMapper.page(new Page<>(), dto); + } + + + @Override + public List find(UnitDict dto) { + return baseMapper.find(dto); + } + + + +} diff --git a/src/main/java/com/whdc/service/impl/UserServiceImpl.java b/src/main/java/com/whdc/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..8d93e59 --- /dev/null +++ b/src/main/java/com/whdc/service/impl/UserServiceImpl.java @@ -0,0 +1,36 @@ +package com.whdc.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.whdc.mapper.UserMapper; +import com.whdc.model.entity.User; +import com.whdc.service.IUserService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * @author xusan + * @date 2024-05-11 + */ +@Service +public class UserServiceImpl extends ServiceImpl implements IUserService { + + + @Override + public IPage page(User dto) { + return baseMapper.page(new Page<>(), dto); + } + + + @Override + public List find(User dto) { + return baseMapper.find(dto); + } + + + +} diff --git a/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java b/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java new file mode 100644 index 0000000..a949796 --- /dev/null +++ b/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java @@ -0,0 +1,71 @@ +package com.whdc.service.impl; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.whdc.mapper.VersionsMapper; +import com.whdc.model.entity.AddressBook; +import com.whdc.model.entity.Versions; +import com.whdc.model.enums.VersionsType; +import com.whdc.service.IVersionsService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Service; + +import java.util.Comparator; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +/** + *

+ * 服务实现类 + *

+ * @author xusan + * @date 2024-05-11 + */ +@Slf4j +@Service +public class VersionsServiceImpl extends ServiceImpl implements IVersionsService { + + + @Override + public IPage page(Versions dto) { + return baseMapper.page(new Page<>(), dto); + } + + + @Override + public List find(Versions dto) { + return baseMapper.find(dto); + } + + @Override + public boolean saveInfo(AddressBook model, VersionsType versionsType) { + + Integer version = 0; + + if (Objects.requireNonNull(versionsType) != VersionsType.ADD) { + List list = this.lambdaQuery() + .eq(Versions::getAbId, model.getId()) + .list(); + if (CollectionUtils.isNotEmpty(list)) { + version = list + .stream().map(Versions::getVersion) + .max(Comparator.comparing(Integer::intValue)) + .get(); + } else { + log.info("当前数据在进行修改但无相关记录；" + model.getId()); + } + } + + // 添加日志 + Versions entity = new Versions(null, JSON.toJSONString(model), model.getId(), ++version, model.getCreateId(), new Date(),versionsType.getName()); + + return this.save(entity); + + } + + +} diff --git a/src/main/resources/mapper/AbUdRMapper.xml b/src/main/resources/mapper/AbUdRMapper.xml new file mode 100644 index 0000000..5739e94 --- /dev/null +++ b/src/main/resources/mapper/AbUdRMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml new file mode 100644 index 0000000..2db6051 --- /dev/null +++ b/src/main/resources/mapper/AddressBookMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/AdinfoMapper.xml b/src/main/resources/mapper/AdinfoMapper.xml new file mode 100644 index 0000000..a94ced0 --- /dev/null +++ b/src/main/resources/mapper/AdinfoMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/ERuleMapper.xml b/src/main/resources/mapper/ERuleMapper.xml deleted file mode 100644 index f626c44..0000000 --- a/src/main/resources/mapper/ERuleMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - diff --git a/src/main/resources/mapper/EStationRulesMapper.xml b/src/main/resources/mapper/EStationRulesMapper.xml deleted file mode 100644 index b52a1fc..0000000 --- a/src/main/resources/mapper/EStationRulesMapper.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/main/resources/mapper/FcMapper.xml b/src/main/resources/mapper/FcMapper.xml new file mode 100644 index 0000000..e87a28f --- /dev/null +++ b/src/main/resources/mapper/FcMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/LoginInfoMapper.xml b/src/main/resources/mapper/LoginInfoMapper.xml new file mode 100644 index 0000000..9d8b7c4 --- /dev/null +++ b/src/main/resources/mapper/LoginInfoMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OrganizationMapper.xml b/src/main/resources/mapper/OrganizationMapper.xml new file mode 100644 index 0000000..6cb693a --- /dev/null +++ b/src/main/resources/mapper/OrganizationMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/UnitDictMapper.xml b/src/main/resources/mapper/UnitDictMapper.xml new file mode 100644 index 0000000..cd36b53 --- /dev/null +++ b/src/main/resources/mapper/UnitDictMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml new file mode 100644 index 0000000..ff97114 --- /dev/null +++ b/src/main/resources/mapper/UserMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/VersionsMapper.xml b/src/main/resources/mapper/VersionsMapper.xml new file mode 100644 index 0000000..cd401c7 --- /dev/null +++ b/src/main/resources/mapper/VersionsMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file