From 8786e12d76067d1b712472633984a04d820368c2 Mon Sep 17 00:00:00 2001 From: hansha Date: Sat, 16 Mar 2024 10:43:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E3=80=81=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E5=8F=8A=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysProfileController.java | 4 + .../controller/system/SysUserController.java | 36 +- .../common/core/domain/entity/SysUser.java | 28 +- .../ruoyi/system/mapper/SysUserMapper.java | 13 +- .../ruoyi/system/service/ISysUserService.java | 11 +- .../service/impl/SysUserServiceImpl.java | 45 ++- .../resources/mapper/system/SysUserMapper.xml | 21 +- ...ontroller.java => SzxcNewsController.java} | 52 ++- .../java/com/ruoyi/szxc/domain/SzxcJmCar.java | 49 +++ .../com/ruoyi/szxc/domain/SzxcJmHouse.java | 50 +++ .../com/ruoyi/szxc/domain/SzxcJmInfo.java | 151 +++---- .../java/com/ruoyi/szxc/domain/SzxcJmTag.java | 50 +++ .../szxc/domain/{News.java => SzxcNews.java} | 6 +- .../ruoyi/szxc/mapper/SzxcJmCarMapper.java | 62 +++ .../ruoyi/szxc/mapper/SzxcJmHouseMapper.java | 61 +++ .../ruoyi/szxc/mapper/SzxcJmTagMapper.java | 61 +++ .../{NewsMapper.java => SzxcNewsMapper.java} | 25 +- .../ruoyi/szxc/service/ISzxcJmCarService.java | 62 +++ .../szxc/service/ISzxcJmHouseService.java | 61 +++ .../ruoyi/szxc/service/ISzxcJmTagService.java | 61 +++ ...NewsService.java => ISzxcNewsService.java} | 25 +- .../szxc/service/impl/NewsServiceImpl.java | 97 ----- .../service/impl/SzxcJmCarServiceImpl.java | 94 +++++ .../service/impl/SzxcJmHouseServiceImpl.java | 93 +++++ .../service/impl/SzxcJmTagServiceImpl.java | 93 +++++ .../service/impl/SzxcNewsServiceImpl.java | 97 +++++ .../mapper/szxc/SzxcJmInfoMapper.xml | 30 +- .../{NewsMapper.xml => SzxcNewsMapper.xml} | 32 +- ruoyi-ui/src/views/szxc/jminfo/index.vue | 378 +++++++++--------- 29 files changed, 1351 insertions(+), 497 deletions(-) rename ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/{NewsController.java => SzxcNewsController.java} (60%) create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmCar.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmHouse.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmTag.java rename ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/{News.java => SzxcNews.java} (97%) create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmCarMapper.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmHouseMapper.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmTagMapper.java rename ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/{NewsMapper.java => SzxcNewsMapper.java} (58%) create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmCarService.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmHouseService.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java rename ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/{INewsService.java => ISzxcNewsService.java} (58%) delete mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/NewsServiceImpl.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmCarServiceImpl.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmHouseServiceImpl.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcNewsServiceImpl.java rename ruoyi-szxc/src/main/resources/mapper/szxc/{NewsMapper.xml => SzxcNewsMapper.xml} (83%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index d5faedd..6eebab9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -65,6 +65,10 @@ public class SysProfileController extends BaseController currentUser.setEmail(user.getEmail()); currentUser.setPhonenumber(user.getPhonenumber()); currentUser.setSex(user.getSex()); + if (StringUtils.isNotEmpty(user.getCardId()) && !userService.checkCardIdUnique(currentUser)) + { + return error("修改用户'" + loginUser.getUsername() + "'失败，身份证号已存在"); + } if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser)) { return error("修改用户'" + loginUser.getUsername() + "'失败，手机号码已存在"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 256367b..c79df48 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -1,21 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -31,6 +15,16 @@ import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.stream.Collectors; /** * 用户信息 @@ -128,6 +122,10 @@ public class SysUserController extends BaseController { return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); } + else if (StringUtils.isNotEmpty(user.getCardId()) && !userService.checkCardIdUnique(user)) + { + return error("新增用户'" + user.getUserName() + "'失败，身份证号已存在"); + } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); @@ -158,8 +156,10 @@ public class SysUserController extends BaseController else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); - } - else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) + }else if(StringUtils.isNotEmpty(user.getCardId()) && !userService.checkCardIdUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败，身份证号已存在"); + }else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 53ad695..2cd3464 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -1,16 +1,19 @@ package com.ruoyi.common.core.domain.entity; -import java.util.Date; -import java.util.List; -import javax.validation.constraints.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.Type; import com.ruoyi.common.annotation.Excels; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.xss.Xss; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; /** * 用户对象 sys_user @@ -45,6 +48,10 @@ public class SysUser extends BaseEntity @Excel(name = "手机号码") private String phonenumber; + /** 身份证号 */ + @Excel(name = "身份证号") + private String cardId; + /** 用户性别 */ @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") private String sex; @@ -177,7 +184,15 @@ public class SysUser extends BaseEntity this.phonenumber = phonenumber; } - public String getSex() + public void setCardId(String cardId) + { + this.cardId = cardId; + } + + public String getCardId() { + return cardId; + } + public String getSex() { return sex; } @@ -306,6 +321,7 @@ public class SysUser extends BaseEntity .append("nickName", getNickName()) .append("email", getEmail()) .append("phonenumber", getPhonenumber()) + .append("cardId", getCardId()) .append("sex", getSex()) .append("avatar", getAvatar()) .append("password", getPassword()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 76e1c79..70a69c6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; import com.ruoyi.common.core.domain.entity.SysUser; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 用户表 数据层 @@ -124,4 +125,12 @@ public interface SysUserMapper * @return 结果 */ public SysUser checkEmailUnique(String email); + + /** + * 校验cardId是否唯一 + * + * @param cardId 身份证号 + * @return 结果 + */ + public SysUser checkCardIdUnique(String cardId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 10bc2ab..722f90b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.common.core.domain.entity.SysUser; +import java.util.List; + /** * 用户 业务层 * @@ -90,6 +91,14 @@ public interface ISysUserService */ public boolean checkEmailUnique(SysUser user); + /** + * 校验cardId是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean checkCardIdUnique(SysUser user); + /** * 校验用户是否允许操作 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index b371060..9236a49 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -1,15 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import javax.validation.Validator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysRole; @@ -22,13 +12,20 @@ import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.domain.SysUserPost; import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; +import com.ruoyi.system.mapper.*; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import javax.validation.Validator; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; /** * 用户 业务层处理 @@ -212,6 +209,24 @@ public class SysUserServiceImpl implements ISysUserService return UserConstants.UNIQUE; } + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public boolean checkCardIdUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkCardIdUnique(user.getCardId()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + /** * 校验用户是否允许操作 * diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index eca3694..70542d5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber,u.card_id, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -141,7 +145,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + insert into sys_user( user_id, @@ -151,6 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" email, avatar, phonenumber, + card_id, sex, password, status, @@ -165,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{email}, #{avatar}, #{phonenumber}, + #{cardId}, #{sex}, #{password}, #{status}, @@ -182,6 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" nick_name = #{nickName}, email = #{email}, phonenumber = #{phonenumber}, + card_id = #{cardId}, sex = #{sex}, avatar = #{avatar}, password = #{password}, diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/NewsController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcNewsController.java similarity index 60% rename from ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/NewsController.java rename to ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcNewsController.java index 5e26181..2824de8 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/NewsController.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcNewsController.java @@ -1,48 +1,42 @@ package com.ruoyi.szxc.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.szxc.domain.News; -import com.ruoyi.szxc.service.INewsService; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.szxc.domain.SzxcNews; +import com.ruoyi.szxc.service.ISzxcNewsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 公告资讯Controller * * @author hs - * @date 2024-03-15 + * @date 2024-03-16 */ @RestController @RequestMapping("/szxc/news") -public class NewsController extends BaseController +public class SzxcNewsController extends BaseController { @Autowired - private INewsService newsService; + private ISzxcNewsService szxcNewsService; /** * 查询公告资讯列表 */ @PreAuthorize("@ss.hasPermi('szxc:news:list')") @GetMapping("/list") - public TableDataInfo list(News news) + public TableDataInfo list(SzxcNews szxcNews) { startPage(); - List list = newsService.selectNewsList(news); + List list = szxcNewsService.selectSzxcNewsList(szxcNews); return getDataTable(list); } @@ -52,10 +46,10 @@ public class NewsController extends BaseController @PreAuthorize("@ss.hasPermi('szxc:news:export')") @Log(title = "公告资讯", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, News news) + public void export(HttpServletResponse response, SzxcNews szxcNews) { - List list = newsService.selectNewsList(news); - ExcelUtil util = new ExcelUtil(News.class); + List list = szxcNewsService.selectSzxcNewsList(szxcNews); + ExcelUtil util = new ExcelUtil(SzxcNews.class); util.exportExcel(response, list, "公告资讯数据"); } @@ -66,7 +60,7 @@ public class NewsController extends BaseController @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(newsService.selectNewsById(id)); + return success(szxcNewsService.selectSzxcNewsById(id)); } /** @@ -75,9 +69,9 @@ public class NewsController extends BaseController @PreAuthorize("@ss.hasPermi('szxc:news:add')") @Log(title = "公告资讯", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody News news) + public AjaxResult add(@RequestBody SzxcNews szxcNews) { - return toAjax(newsService.insertNews(news)); + return toAjax(szxcNewsService.insertSzxcNews(szxcNews)); } /** @@ -86,9 +80,9 @@ public class NewsController extends BaseController @PreAuthorize("@ss.hasPermi('szxc:news:edit')") @Log(title = "公告资讯", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody News news) + public AjaxResult edit(@RequestBody SzxcNews szxcNews) { - return toAjax(newsService.updateNews(news)); + return toAjax(szxcNewsService.updateSzxcNews(szxcNews)); } /** @@ -99,6 +93,6 @@ public class NewsController extends BaseController @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(newsService.deleteNewsByIds(ids)); + return toAjax(szxcNewsService.deleteSzxcNewsByIds(ids)); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmCar.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmCar.java new file mode 100644 index 0000000..e02d4ba --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmCar.java @@ -0,0 +1,49 @@ +package com.ruoyi.szxc.domain; + +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 居民车辆关联对象 szxc_jm_car + * + * @author hs + * @date 2024-03-16 + */ +public class SzxcJmCar extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 居民id */ + private Long jmId; + + /** 车辆id */ + private Long carId; + + public void setJmId(Long jmId) + { + this.jmId = jmId; + } + + public Long getJmId() + { + return jmId; + } + public void setCarId(Long carId) + { + this.carId = carId; + } + + public Long getCarId() + { + return carId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jmId", getJmId()) + .append("carId", getCarId()) + .toString(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmHouse.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmHouse.java new file mode 100644 index 0000000..6a08a58 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmHouse.java @@ -0,0 +1,50 @@ +package com.ruoyi.szxc.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 居民房屋关联对象 szxc_jm_house + * + * @author hs + * @date 2024-03-16 + */ +public class SzxcJmHouse extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 居民id */ + private Long jmId; + + /** 房屋id */ + private Long houseId; + + public void setJmId(Long jmId) + { + this.jmId = jmId; + } + + public Long getJmId() + { + return jmId; + } + public void setHouseId(Long houseId) + { + this.houseId = houseId; + } + + public Long getHouseId() + { + return houseId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jmId", getJmId()) + .append("houseId", getHouseId()) + .toString(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java index f315197..a283ab4 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java @@ -1,17 +1,18 @@ package com.ruoyi.szxc.domain; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; /** * 居民信息对象 szxc_jm_info - * + * * @author hs - * @date 2024-03-15 + * @date 2024-03-16 */ public class SzxcJmInfo extends BaseEntity { @@ -42,7 +43,7 @@ public class SzxcJmInfo extends BaseEntity /** 身份证号 */ @Excel(name = "身份证号") - private String idCard; + private String cardId; /** 出生日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -53,8 +54,8 @@ public class SzxcJmInfo extends BaseEntity @Excel(name = "年龄") private Long age; - /** 用户性别（0男 1女） */ - @Excel(name = "用户性别", readConverterExp = "0=男,1=女") + /** 性别（0男 1女 2未知） */ + @Excel(name = "性别", readConverterExp = "0=男,1=女,2=未知") private String sex; /** 籍贯 */ @@ -97,183 +98,183 @@ public class SzxcJmInfo extends BaseEntity @Excel(name = "创建者ID") private Long userId; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setDeptId(Long deptId) + public void setDeptId(Long deptId) { this.deptId = deptId; } - public Long getDeptId() + public Long getDeptId() { return deptId; } - public void setDeptName(String deptName) + public void setDeptName(String deptName) { this.deptName = deptName; } - public String getDeptName() + public String getDeptName() { return deptName; } - public void setName(String name) + public void setName(String name) { this.name = name; } - public String getName() + public String getName() { return name; } - public void setOldName(String oldName) + public void setOldName(String oldName) { this.oldName = oldName; } - public String getOldName() + public String getOldName() { return oldName; } - public void setNationality(String nationality) + public void setNationality(String nationality) { this.nationality = nationality; } - public String getNationality() + public String getNationality() { return nationality; } - public void setIdCard(String idCard) + public void setCardId(String cardId) { - this.idCard = idCard; + this.cardId = cardId; } - public String getIdCard() + public String getCardId() { - return idCard; + return cardId; } - public void setBornDate(Date bornDate) + public void setBornDate(Date bornDate) { this.bornDate = bornDate; } - public Date getBornDate() + public Date getBornDate() { return bornDate; } - public void setAge(Long age) + public void setAge(Long age) { this.age = age; } - public Long getAge() + public Long getAge() { return age; } - public void setSex(String sex) + public void setSex(String sex) { this.sex = sex; } - public String getSex() + public String getSex() { return sex; } - public void setJg(String jg) + public void setJg(String jg) { this.jg = jg; } - public String getJg() + public String getJg() { return jg; } - public void setRelation(String relation) + public void setRelation(String relation) { this.relation = relation; } - public String getRelation() + public String getRelation() { return relation; } - public void setJgNature(String jgNature) + public void setJgNature(String jgNature) { this.jgNature = jgNature; } - public String getJgNature() + public String getJgNature() { return jgNature; } - public void setLongLive(String longLive) + public void setLongLive(String longLive) { this.longLive = longLive; } - public String getLongLive() + public String getLongLive() { return longLive; } - public void setHjAddress(String hjAddress) + public void setHjAddress(String hjAddress) { this.hjAddress = hjAddress; } - public String getHjAddress() + public String getHjAddress() { return hjAddress; } - public void setPhone(String phone) + public void setPhone(String phone) { this.phone = phone; } - public String getPhone() + public String getPhone() { return phone; } - public void setHead(String head) + public void setHead(String head) { this.head = head; } - public String getHead() + public String getHead() { return head; } - public void setSameHeadIds(String sameHeadIds) + public void setSameHeadIds(String sameHeadIds) { this.sameHeadIds = sameHeadIds; } - public String getSameHeadIds() + public String getSameHeadIds() { return sameHeadIds; } - public void setOff(String off) + public void setOff(String off) { this.off = off; } - public String getOff() + public String getOff() { return off; } - public void setUserId(Long userId) + public void setUserId(Long userId) { this.userId = userId; } - public Long getUserId() + public Long getUserId() { return userId; } @@ -281,30 +282,30 @@ public class SzxcJmInfo extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("deptName", getDeptName()) - .append("name", getName()) - .append("oldName", getOldName()) - .append("nationality", getNationality()) - .append("idCard", getIdCard()) - .append("bornDate", getBornDate()) - .append("age", getAge()) - .append("sex", getSex()) - .append("jg", getJg()) - .append("relation", getRelation()) - .append("jgNature", getJgNature()) - .append("longLive", getLongLive()) - .append("hjAddress", getHjAddress()) - .append("phone", getPhone()) - .append("head", getHead()) - .append("sameHeadIds", getSameHeadIds()) - .append("off", getOff()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("userId", getUserId()) - .toString(); + .append("id", getId()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("name", getName()) + .append("oldName", getOldName()) + .append("nationality", getNationality()) + .append("cardId", getCardId()) + .append("bornDate", getBornDate()) + .append("age", getAge()) + .append("sex", getSex()) + .append("jg", getJg()) + .append("relation", getRelation()) + .append("jgNature", getJgNature()) + .append("longLive", getLongLive()) + .append("hjAddress", getHjAddress()) + .append("phone", getPhone()) + .append("head", getHead()) + .append("sameHeadIds", getSameHeadIds()) + .append("off", getOff()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("userId", getUserId()) + .toString(); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmTag.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmTag.java new file mode 100644 index 0000000..d144dac --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmTag.java @@ -0,0 +1,50 @@ +package com.ruoyi.szxc.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 居民标签关联对象 szxc_jm_tag + * + * @author hs + * @date 2024-03-16 + */ +public class SzxcJmTag extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 居民id */ + private Long jmId; + + /** 标签id */ + private Long tagId; + + public void setJmId(Long jmId) + { + this.jmId = jmId; + } + + public Long getJmId() + { + return jmId; + } + public void setTagId(Long tagId) + { + this.tagId = tagId; + } + + public Long getTagId() + { + return tagId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jmId", getJmId()) + .append("tagId", getTagId()) + .toString(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/News.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcNews.java similarity index 97% rename from ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/News.java rename to ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcNews.java index 5eff290..c6a2188 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/News.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcNews.java @@ -6,12 +6,12 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 公告资讯对象 news + * 公告资讯对象 szxc_news * * @author hs - * @date 2024-03-15 + * @date 2024-03-16 */ -public class News extends BaseEntity +public class SzxcNews extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmCarMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmCarMapper.java new file mode 100644 index 0000000..0379ba5 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmCarMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.szxc.mapper; + +import com.ruoyi.szxc.domain.SzxcJmCar; + +import java.util.List; + +/** + * 居民车辆关联Mapper接口 + * + * @author hs + * @date 2024-03-16 + */ +public interface SzxcJmCarMapper +{ + /** + * 查询居民车辆关联 + * + * @param jmId 居民车辆关联主键 + * @return 居民车辆关联 + */ + public SzxcJmCar selectSzxcJmCarByJmId(Long jmId); + + /** + * 查询居民车辆关联列表 + * + * @param szxcJmCar 居民车辆关联 + * @return 居民车辆关联集合 + */ + public List selectSzxcJmCarList(SzxcJmCar szxcJmCar); + + /** + * 新增居民车辆关联 + * + * @param szxcJmCar 居民车辆关联 + * @return 结果 + */ + public int insertSzxcJmCar(SzxcJmCar szxcJmCar); + + /** + * 修改居民车辆关联 + * + * @param szxcJmCar 居民车辆关联 + * @return 结果 + */ + public int updateSzxcJmCar(SzxcJmCar szxcJmCar); + + /** + * 删除居民车辆关联 + * + * @param jmId 居民车辆关联主键 + * @return 结果 + */ + public int deleteSzxcJmCarByJmId(Long jmId); + + /** + * 批量删除居民车辆关联 + * + * @param jmIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSzxcJmCarByJmIds(Long[] jmIds); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmHouseMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmHouseMapper.java new file mode 100644 index 0000000..b609386 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmHouseMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.szxc.mapper; + +import java.util.List; +import com.ruoyi.szxc.domain.SzxcJmHouse; + +/** + * 居民房屋关联Mapper接口 + * + * @author hs + * @date 2024-03-16 + */ +public interface SzxcJmHouseMapper +{ + /** + * 查询居民房屋关联 + * + * @param jmId 居民房屋关联主键 + * @return 居民房屋关联 + */ + public SzxcJmHouse selectSzxcJmHouseByJmId(Long jmId); + + /** + * 查询居民房屋关联列表 + * + * @param szxcJmHouse 居民房屋关联 + * @return 居民房屋关联集合 + */ + public List selectSzxcJmHouseList(SzxcJmHouse szxcJmHouse); + + /** + * 新增居民房屋关联 + * + * @param szxcJmHouse 居民房屋关联 + * @return 结果 + */ + public int insertSzxcJmHouse(SzxcJmHouse szxcJmHouse); + + /** + * 修改居民房屋关联 + * + * @param szxcJmHouse 居民房屋关联 + * @return 结果 + */ + public int updateSzxcJmHouse(SzxcJmHouse szxcJmHouse); + + /** + * 删除居民房屋关联 + * + * @param jmId 居民房屋关联主键 + * @return 结果 + */ + public int deleteSzxcJmHouseByJmId(Long jmId); + + /** + * 批量删除居民房屋关联 + * + * @param jmIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSzxcJmHouseByJmIds(Long[] jmIds); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmTagMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmTagMapper.java new file mode 100644 index 0000000..9b0986e --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcJmTagMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.szxc.mapper; + +import java.util.List; +import com.ruoyi.szxc.domain.SzxcJmTag; + +/** + * 居民标签关联Mapper接口 + * + * @author hs + * @date 2024-03-16 + */ +public interface SzxcJmTagMapper +{ + /** + * 查询居民标签关联 + * + * @param jmId 居民标签关联主键 + * @return 居民标签关联 + */ + public SzxcJmTag selectSzxcJmTagByJmId(Long jmId); + + /** + * 查询居民标签关联列表 + * + * @param szxcJmTag 居民标签关联 + * @return 居民标签关联集合 + */ + public List selectSzxcJmTagList(SzxcJmTag szxcJmTag); + + /** + * 新增居民标签关联 + * + * @param szxcJmTag 居民标签关联 + * @return 结果 + */ + public int insertSzxcJmTag(SzxcJmTag szxcJmTag); + + /** + * 修改居民标签关联 + * + * @param szxcJmTag 居民标签关联 + * @return 结果 + */ + public int updateSzxcJmTag(SzxcJmTag szxcJmTag); + + /** + * 删除居民标签关联 + * + * @param jmId 居民标签关联主键 + * @return 结果 + */ + public int deleteSzxcJmTagByJmId(Long jmId); + + /** + * 批量删除居民标签关联 + * + * @param jmIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSzxcJmTagByJmIds(Long[] jmIds); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/NewsMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcNewsMapper.java similarity index 58% rename from ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/NewsMapper.java rename to ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcNewsMapper.java index 0631b68..7d5e28d 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/NewsMapper.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcNewsMapper.java @@ -1,16 +1,15 @@ package com.ruoyi.szxc.mapper; -import com.ruoyi.szxc.domain.News; - import java.util.List; +import com.ruoyi.szxc.domain.SzxcNews; /** * 公告资讯Mapper接口 * * @author hs - * @date 2024-03-15 + * @date 2024-03-16 */ -public interface NewsMapper +public interface SzxcNewsMapper { /** * 查询公告资讯 @@ -18,31 +17,31 @@ public interface NewsMapper * @param id 公告资讯主键 * @return 公告资讯 */ - public News selectNewsById(Long id); + public SzxcNews selectSzxcNewsById(Long id); /** * 查询公告资讯列表 * - * @param news 公告资讯 + * @param szxcNews 公告资讯 * @return 公告资讯集合 */ - public List selectNewsList(News news); + public List selectSzxcNewsList(SzxcNews szxcNews); /** * 新增公告资讯 * - * @param news 公告资讯 + * @param szxcNews 公告资讯 * @return 结果 */ - public int insertNews(News news); + public int insertSzxcNews(SzxcNews szxcNews); /** * 修改公告资讯 * - * @param news 公告资讯 + * @param szxcNews 公告资讯 * @return 结果 */ - public int updateNews(News news); + public int updateSzxcNews(SzxcNews szxcNews); /** * 删除公告资讯 @@ -50,7 +49,7 @@ public interface NewsMapper * @param id 公告资讯主键 * @return 结果 */ - public int deleteNewsById(Long id); + public int deleteSzxcNewsById(Long id); /** * 批量删除公告资讯 @@ -58,5 +57,5 @@ public interface NewsMapper * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteNewsByIds(Long[] ids); + public int deleteSzxcNewsByIds(Long[] ids); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmCarService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmCarService.java new file mode 100644 index 0000000..3537de9 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmCarService.java @@ -0,0 +1,62 @@ +package com.ruoyi.szxc.service; + +import com.ruoyi.szxc.domain.SzxcJmCar; + +import java.util.List; + +/** + * 居民车辆关联Service接口 + * + * @author hs + * @date 2024-03-16 + */ +public interface ISzxcJmCarService +{ + /** + * 查询居民车辆关联 + * + * @param jmId 居民车辆关联主键 + * @return 居民车辆关联 + */ + public SzxcJmCar selectSzxcJmCarByJmId(Long jmId); + + /** + * 查询居民车辆关联列表 + * + * @param szxcJmCar 居民车辆关联 + * @return 居民车辆关联集合 + */ + public List selectSzxcJmCarList(SzxcJmCar szxcJmCar); + + /** + * 新增居民车辆关联 + * + * @param szxcJmCar 居民车辆关联 + * @return 结果 + */ + public int insertSzxcJmCar(SzxcJmCar szxcJmCar); + + /** + * 修改居民车辆关联 + * + * @param szxcJmCar 居民车辆关联 + * @return 结果 + */ + public int updateSzxcJmCar(SzxcJmCar szxcJmCar); + + /** + * 批量删除居民车辆关联 + * + * @param jmIds 需要删除的居民车辆关联主键集合 + * @return 结果 + */ + public int deleteSzxcJmCarByJmIds(Long[] jmIds); + + /** + * 删除居民车辆关联信息 + * + * @param jmId 居民车辆关联主键 + * @return 结果 + */ + public int deleteSzxcJmCarByJmId(Long jmId); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmHouseService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmHouseService.java new file mode 100644 index 0000000..7b3ac9d --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmHouseService.java @@ -0,0 +1,61 @@ +package com.ruoyi.szxc.service; + +import java.util.List; +import com.ruoyi.szxc.domain.SzxcJmHouse; + +/** + * 居民房屋关联Service接口 + * + * @author hs + * @date 2024-03-16 + */ +public interface ISzxcJmHouseService +{ + /** + * 查询居民房屋关联 + * + * @param jmId 居民房屋关联主键 + * @return 居民房屋关联 + */ + public SzxcJmHouse selectSzxcJmHouseByJmId(Long jmId); + + /** + * 查询居民房屋关联列表 + * + * @param szxcJmHouse 居民房屋关联 + * @return 居民房屋关联集合 + */ + public List selectSzxcJmHouseList(SzxcJmHouse szxcJmHouse); + + /** + * 新增居民房屋关联 + * + * @param szxcJmHouse 居民房屋关联 + * @return 结果 + */ + public int insertSzxcJmHouse(SzxcJmHouse szxcJmHouse); + + /** + * 修改居民房屋关联 + * + * @param szxcJmHouse 居民房屋关联 + * @return 结果 + */ + public int updateSzxcJmHouse(SzxcJmHouse szxcJmHouse); + + /** + * 批量删除居民房屋关联 + * + * @param jmIds 需要删除的居民房屋关联主键集合 + * @return 结果 + */ + public int deleteSzxcJmHouseByJmIds(Long[] jmIds); + + /** + * 删除居民房屋关联信息 + * + * @param jmId 居民房屋关联主键 + * @return 结果 + */ + public int deleteSzxcJmHouseByJmId(Long jmId); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java new file mode 100644 index 0000000..b27df04 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcJmTagService.java @@ -0,0 +1,61 @@ +package com.ruoyi.szxc.service; + +import java.util.List; +import com.ruoyi.szxc.domain.SzxcJmTag; + +/** + * 居民标签关联Service接口 + * + * @author hs + * @date 2024-03-16 + */ +public interface ISzxcJmTagService +{ + /** + * 查询居民标签关联 + * + * @param jmId 居民标签关联主键 + * @return 居民标签关联 + */ + public SzxcJmTag selectSzxcJmTagByJmId(Long jmId); + + /** + * 查询居民标签关联列表 + * + * @param szxcJmTag 居民标签关联 + * @return 居民标签关联集合 + */ + public List selectSzxcJmTagList(SzxcJmTag szxcJmTag); + + /** + * 新增居民标签关联 + * + * @param szxcJmTag 居民标签关联 + * @return 结果 + */ + public int insertSzxcJmTag(SzxcJmTag szxcJmTag); + + /** + * 修改居民标签关联 + * + * @param szxcJmTag 居民标签关联 + * @return 结果 + */ + public int updateSzxcJmTag(SzxcJmTag szxcJmTag); + + /** + * 批量删除居民标签关联 + * + * @param jmIds 需要删除的居民标签关联主键集合 + * @return 结果 + */ + public int deleteSzxcJmTagByJmIds(Long[] jmIds); + + /** + * 删除居民标签关联信息 + * + * @param jmId 居民标签关联主键 + * @return 结果 + */ + public int deleteSzxcJmTagByJmId(Long jmId); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/INewsService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcNewsService.java similarity index 58% rename from ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/INewsService.java rename to ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcNewsService.java index 60d76be..987c830 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/INewsService.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcNewsService.java @@ -1,16 +1,15 @@ package com.ruoyi.szxc.service; -import com.ruoyi.szxc.domain.News; - import java.util.List; +import com.ruoyi.szxc.domain.SzxcNews; /** * 公告资讯Service接口 * * @author hs - * @date 2024-03-15 + * @date 2024-03-16 */ -public interface INewsService +public interface ISzxcNewsService { /** * 查询公告资讯 @@ -18,31 +17,31 @@ public interface INewsService * @param id 公告资讯主键 * @return 公告资讯 */ - public News selectNewsById(Long id); + public SzxcNews selectSzxcNewsById(Long id); /** * 查询公告资讯列表 * - * @param news 公告资讯 + * @param szxcNews 公告资讯 * @return 公告资讯集合 */ - public List selectNewsList(News news); + public List selectSzxcNewsList(SzxcNews szxcNews); /** * 新增公告资讯 * - * @param news 公告资讯 + * @param szxcNews 公告资讯 * @return 结果 */ - public int insertNews(News news); + public int insertSzxcNews(SzxcNews szxcNews); /** * 修改公告资讯 * - * @param news 公告资讯 + * @param szxcNews 公告资讯 * @return 结果 */ - public int updateNews(News news); + public int updateSzxcNews(SzxcNews szxcNews); /** * 批量删除公告资讯 @@ -50,7 +49,7 @@ public interface INewsService * @param ids 需要删除的公告资讯主键集合 * @return 结果 */ - public int deleteNewsByIds(Long[] ids); + public int deleteSzxcNewsByIds(Long[] ids); /** * 删除公告资讯信息 @@ -58,5 +57,5 @@ public interface INewsService * @param id 公告资讯主键 * @return 结果 */ - public int deleteNewsById(Long id); + public int deleteSzxcNewsById(Long id); } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/NewsServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/NewsServiceImpl.java deleted file mode 100644 index ff36bfd..0000000 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/NewsServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.ruoyi.szxc.service.impl; - -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.szxc.domain.News; -import com.ruoyi.szxc.mapper.NewsMapper; -import com.ruoyi.szxc.service.INewsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 公告资讯Service业务层处理 - * - * @author hs - * @date 2024-03-15 - */ -@Service -public class NewsServiceImpl implements INewsService -{ - @Autowired - private NewsMapper newsMapper; - - /** - * 查询公告资讯 - * - * @param id 公告资讯主键 - * @return 公告资讯 - */ - @Override - public News selectNewsById(Long id) - { - return newsMapper.selectNewsById(id); - } - - /** - * 查询公告资讯列表 - * - * @param news 公告资讯 - * @return 公告资讯 - */ - @Override - public List selectNewsList(News news) - { - return newsMapper.selectNewsList(news); - } - - /** - * 新增公告资讯 - * - * @param news 公告资讯 - * @return 结果 - */ - @Override - public int insertNews(News news) - { - news.setCreateTime(DateUtils.getNowDate()); - return newsMapper.insertNews(news); - } - - /** - * 修改公告资讯 - * - * @param news 公告资讯 - * @return 结果 - */ - @Override - public int updateNews(News news) - { - news.setUpdateTime(DateUtils.getNowDate()); - return newsMapper.updateNews(news); - } - - /** - * 批量删除公告资讯 - * - * @param ids 需要删除的公告资讯主键 - * @return 结果 - */ - @Override - public int deleteNewsByIds(Long[] ids) - { - return newsMapper.deleteNewsByIds(ids); - } - - /** - * 删除公告资讯信息 - * - * @param id 公告资讯主键 - * @return 结果 - */ - @Override - public int deleteNewsById(Long id) - { - return newsMapper.deleteNewsById(id); - } -} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmCarServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmCarServiceImpl.java new file mode 100644 index 0000000..efdacae --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmCarServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.szxc.service.impl; + +import com.ruoyi.szxc.domain.SzxcJmCar; +import com.ruoyi.szxc.mapper.SzxcJmCarMapper; +import com.ruoyi.szxc.service.ISzxcJmCarService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 居民车辆关联Service业务层处理 + * + * @author hs + * @date 2024-03-16 + */ +@Service +public class SzxcJmCarServiceImpl implements ISzxcJmCarService +{ + @Autowired + private SzxcJmCarMapper szxcJmCarMapper; + + /** + * 查询居民车辆关联 + * + * @param jmId 居民车辆关联主键 + * @return 居民车辆关联 + */ + @Override + public SzxcJmCar selectSzxcJmCarByJmId(Long jmId) + { + return szxcJmCarMapper.selectSzxcJmCarByJmId(jmId); + } + + /** + * 查询居民车辆关联列表 + * + * @param szxcJmCar 居民车辆关联 + * @return 居民车辆关联 + */ + @Override + public List selectSzxcJmCarList(SzxcJmCar szxcJmCar) + { + return szxcJmCarMapper.selectSzxcJmCarList(szxcJmCar); + } + + /** + * 新增居民车辆关联 + * + * @param szxcJmCar 居民车辆关联 + * @return 结果 + */ + @Override + public int insertSzxcJmCar(SzxcJmCar szxcJmCar) + { + return szxcJmCarMapper.insertSzxcJmCar(szxcJmCar); + } + + /** + * 修改居民车辆关联 + * + * @param szxcJmCar 居民车辆关联 + * @return 结果 + */ + @Override + public int updateSzxcJmCar(SzxcJmCar szxcJmCar) + { + return szxcJmCarMapper.updateSzxcJmCar(szxcJmCar); + } + + /** + * 批量删除居民车辆关联 + * + * @param jmIds 需要删除的居民车辆关联主键 + * @return 结果 + */ + @Override + public int deleteSzxcJmCarByJmIds(Long[] jmIds) + { + return szxcJmCarMapper.deleteSzxcJmCarByJmIds(jmIds); + } + + /** + * 删除居民车辆关联信息 + * + * @param jmId 居民车辆关联主键 + * @return 结果 + */ + @Override + public int deleteSzxcJmCarByJmId(Long jmId) + { + return szxcJmCarMapper.deleteSzxcJmCarByJmId(jmId); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmHouseServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmHouseServiceImpl.java new file mode 100644 index 0000000..ef1300e --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmHouseServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.szxc.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.szxc.mapper.SzxcJmHouseMapper; +import com.ruoyi.szxc.domain.SzxcJmHouse; +import com.ruoyi.szxc.service.ISzxcJmHouseService; + +/** + * 居民房屋关联Service业务层处理 + * + * @author hs + * @date 2024-03-16 + */ +@Service +public class SzxcJmHouseServiceImpl implements ISzxcJmHouseService +{ + @Autowired + private SzxcJmHouseMapper szxcJmHouseMapper; + + /** + * 查询居民房屋关联 + * + * @param jmId 居民房屋关联主键 + * @return 居民房屋关联 + */ + @Override + public SzxcJmHouse selectSzxcJmHouseByJmId(Long jmId) + { + return szxcJmHouseMapper.selectSzxcJmHouseByJmId(jmId); + } + + /** + * 查询居民房屋关联列表 + * + * @param szxcJmHouse 居民房屋关联 + * @return 居民房屋关联 + */ + @Override + public List selectSzxcJmHouseList(SzxcJmHouse szxcJmHouse) + { + return szxcJmHouseMapper.selectSzxcJmHouseList(szxcJmHouse); + } + + /** + * 新增居民房屋关联 + * + * @param szxcJmHouse 居民房屋关联 + * @return 结果 + */ + @Override + public int insertSzxcJmHouse(SzxcJmHouse szxcJmHouse) + { + return szxcJmHouseMapper.insertSzxcJmHouse(szxcJmHouse); + } + + /** + * 修改居民房屋关联 + * + * @param szxcJmHouse 居民房屋关联 + * @return 结果 + */ + @Override + public int updateSzxcJmHouse(SzxcJmHouse szxcJmHouse) + { + return szxcJmHouseMapper.updateSzxcJmHouse(szxcJmHouse); + } + + /** + * 批量删除居民房屋关联 + * + * @param jmIds 需要删除的居民房屋关联主键 + * @return 结果 + */ + @Override + public int deleteSzxcJmHouseByJmIds(Long[] jmIds) + { + return szxcJmHouseMapper.deleteSzxcJmHouseByJmIds(jmIds); + } + + /** + * 删除居民房屋关联信息 + * + * @param jmId 居民房屋关联主键 + * @return 结果 + */ + @Override + public int deleteSzxcJmHouseByJmId(Long jmId) + { + return szxcJmHouseMapper.deleteSzxcJmHouseByJmId(jmId); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java new file mode 100644 index 0000000..f6800cf --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcJmTagServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.szxc.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.szxc.mapper.SzxcJmTagMapper; +import com.ruoyi.szxc.domain.SzxcJmTag; +import com.ruoyi.szxc.service.ISzxcJmTagService; + +/** + * 居民标签关联Service业务层处理 + * + * @author hs + * @date 2024-03-16 + */ +@Service +public class SzxcJmTagServiceImpl implements ISzxcJmTagService +{ + @Autowired + private SzxcJmTagMapper szxcJmTagMapper; + + /** + * 查询居民标签关联 + * + * @param jmId 居民标签关联主键 + * @return 居民标签关联 + */ + @Override + public SzxcJmTag selectSzxcJmTagByJmId(Long jmId) + { + return szxcJmTagMapper.selectSzxcJmTagByJmId(jmId); + } + + /** + * 查询居民标签关联列表 + * + * @param szxcJmTag 居民标签关联 + * @return 居民标签关联 + */ + @Override + public List selectSzxcJmTagList(SzxcJmTag szxcJmTag) + { + return szxcJmTagMapper.selectSzxcJmTagList(szxcJmTag); + } + + /** + * 新增居民标签关联 + * + * @param szxcJmTag 居民标签关联 + * @return 结果 + */ + @Override + public int insertSzxcJmTag(SzxcJmTag szxcJmTag) + { + return szxcJmTagMapper.insertSzxcJmTag(szxcJmTag); + } + + /** + * 修改居民标签关联 + * + * @param szxcJmTag 居民标签关联 + * @return 结果 + */ + @Override + public int updateSzxcJmTag(SzxcJmTag szxcJmTag) + { + return szxcJmTagMapper.updateSzxcJmTag(szxcJmTag); + } + + /** + * 批量删除居民标签关联 + * + * @param jmIds 需要删除的居民标签关联主键 + * @return 结果 + */ + @Override + public int deleteSzxcJmTagByJmIds(Long[] jmIds) + { + return szxcJmTagMapper.deleteSzxcJmTagByJmIds(jmIds); + } + + /** + * 删除居民标签关联信息 + * + * @param jmId 居民标签关联主键 + * @return 结果 + */ + @Override + public int deleteSzxcJmTagByJmId(Long jmId) + { + return szxcJmTagMapper.deleteSzxcJmTagByJmId(jmId); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcNewsServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcNewsServiceImpl.java new file mode 100644 index 0000000..64304b9 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcNewsServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.szxc.service.impl; + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.szxc.domain.SzxcNews; +import com.ruoyi.szxc.mapper.SzxcNewsMapper; +import com.ruoyi.szxc.service.ISzxcNewsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 公告资讯Service业务层处理 + * + * @author hs + * @date 2024-03-16 + */ +@Service +public class SzxcNewsServiceImpl implements ISzxcNewsService +{ + @Autowired + private SzxcNewsMapper szxcNewsMapper; + + /** + * 查询公告资讯 + * + * @param id 公告资讯主键 + * @return 公告资讯 + */ + @Override + public SzxcNews selectSzxcNewsById(Long id) + { + return szxcNewsMapper.selectSzxcNewsById(id); + } + + /** + * 查询公告资讯列表 + * + * @param szxcNews 公告资讯 + * @return 公告资讯 + */ + @Override + public List selectSzxcNewsList(SzxcNews szxcNews) + { + return szxcNewsMapper.selectSzxcNewsList(szxcNews); + } + + /** + * 新增公告资讯 + * + * @param szxcNews 公告资讯 + * @return 结果 + */ + @Override + public int insertSzxcNews(SzxcNews szxcNews) + { + szxcNews.setCreateTime(DateUtils.getNowDate()); + return szxcNewsMapper.insertSzxcNews(szxcNews); + } + + /** + * 修改公告资讯 + * + * @param szxcNews 公告资讯 + * @return 结果 + */ + @Override + public int updateSzxcNews(SzxcNews szxcNews) + { + szxcNews.setUpdateTime(DateUtils.getNowDate()); + return szxcNewsMapper.updateSzxcNews(szxcNews); + } + + /** + * 批量删除公告资讯 + * + * @param ids 需要删除的公告资讯主键 + * @return 结果 + */ + @Override + public int deleteSzxcNewsByIds(Long[] ids) + { + return szxcNewsMapper.deleteSzxcNewsByIds(ids); + } + + /** + * 删除公告资讯信息 + * + * @param id 公告资讯主键 + * @return 结果 + */ + @Override + public int deleteSzxcNewsById(Long id) + { + return szxcNewsMapper.deleteSzxcNewsById(id); + } +} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml index e255895..9d7838b 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcJmInfoMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -32,18 +32,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, dept_id, dept_name, name, old_name, nationality, id_card, born_date, age, sex, jg, relation, jg_nature, long_live, hj_address, phone, head, same_head_ids, off, create_by, create_time, update_by, update_time, user_id from szxc_jm_info + select id, dept_id, dept_name, name, old_name, nationality, card_id, born_date, age, sex, jg, relation, jg_nature, long_live, hj_address, phone, head, same_head_ids, off, create_by, create_time, update_by, update_time, user_id from szxc_jm_info - + - + insert into szxc_jm_info @@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" name, old_name, nationality, - id_card, + card_id, born_date, age, sex, @@ -91,14 +91,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, user_id, - + #{deptId}, #{deptName}, #{name}, #{oldName}, #{nationality}, - #{idCard}, + #{cardId}, #{bornDate}, #{age}, #{sex}, @@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{userId}, - + @@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" name = #{name}, old_name = #{oldName}, nationality = #{nationality}, - id_card = #{idCard}, + card_id = #{cardId}, born_date = #{bornDate}, age = #{age}, sex = #{sex}, @@ -154,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from szxc_jm_info where id in + delete from szxc_jm_info where id in #{id} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/NewsMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcNewsMapper.xml similarity index 83% rename from ruoyi-szxc/src/main/resources/mapper/szxc/NewsMapper.xml rename to ruoyi-szxc/src/main/resources/mapper/szxc/SzxcNewsMapper.xml index 2c383e4..d660db1 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/NewsMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcNewsMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -20,12 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - select id, title, type, picture, content, leave, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from news + + select id, title, type, picture, content, leave, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_news - + and title = #{title} and type = #{type} @@ -38,13 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + where id = #{id} - - insert into news + + insert into szxc_news title, type, @@ -75,8 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - update news + + update szxc_news title = #{title}, type = #{type}, @@ -94,12 +94,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - delete from news where id = #{id} + + delete from szxc_news where id = #{id} - - delete from news where id in + + delete from szxc_news where id in #{id} diff --git a/ruoyi-ui/src/views/szxc/jminfo/index.vue b/ruoyi-ui/src/views/szxc/jminfo/index.vue index 2a4acab..6937109 100644 --- a/ruoyi-ui/src/views/szxc/jminfo/index.vue +++ b/ruoyi-ui/src/views/szxc/jminfo/index.vue @@ -41,9 +41,9 @@ @keyup.enter.native="handleQuery" /> - + + v-model="queryParams.bornDate" + type="date" + value-format="yyyy-MM-dd" + placeholder="请选择出生日期"> @@ -205,14 +205,14 @@ - + - + @@ -242,7 +242,7 @@ - + - - + + + v-model="form.bornDate" + type="date" + value-format="yyyy-MM-dd" + placeholder="请选择出生日期"> @@ -323,186 +323,186 @@