增删改查plus

main
hanrenchun 1 year ago
parent 34c871d91a
commit 1d06202dc7

@ -156,13 +156,15 @@
<version>${ruoyi.version}</version>
</dependency>
<!-- 测试模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>rouyi-mybatisdemo</artifactId>
<version>${ruoyi.version}</version>
<artifactId>rouyi-place</artifactId>
<version>3.8.6</version>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.ruoyi</groupId>
@ -187,6 +189,7 @@
<module>ruoyi-quartz</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>rouyi-place</module>
</modules>
<packaging>pom</packaging>

@ -61,6 +61,13 @@
<artifactId>ruoyi-generator</artifactId>
</dependency>
<!-- 测试模块-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>rouyi-place</artifactId>
</dependency>
</dependencies>
<build>

@ -6,7 +6,7 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.0.188:55306/watu3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.0.188:55306/watu4?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: '!QAZ1qaz'
# 从库数据源

@ -124,7 +124,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.4.1</version>
<version>3.5.1</version>
</dependency>
<dependency>

@ -0,0 +1,70 @@
package com.ruoyi.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.BasePlaceInfo;
import com.ruoyi.system.service.BasePlaceInfoService;
import com.ruoyi.system.service.ISysDictTypeService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@RestController
@RequiredArgsConstructor
@RequestMapping("/BasePlace")
public class BasePlaceController extends BaseController {
private final BasePlaceInfoService basePlaceInfoService;
private final ISysDictTypeService iSysDictTypeService;
@PostMapping
public AjaxResult insertPlace(@RequestBody BasePlaceInfo basePlaceInfo) {
LambdaQueryChainWrapper<BasePlaceInfo> wrapper = basePlaceInfoService.lambdaQuery()
.eq(BasePlaceInfo::getPlaceName, basePlaceInfo.getPlaceName());
boolean empty = wrapper.isEmptyOfEntity();
return (empty) ? AjaxResult.success(basePlaceInfoService.save(basePlaceInfo)): AjaxResult.error("场所已添加!不用再加了!");
}
@PutMapping
public AjaxResult updatePlace(@RequestBody BasePlaceInfo basePlaceInfo){
return toAjax(basePlaceInfoService.updateById(basePlaceInfo));
}
@DeleteMapping
public AjaxResult deletePlace(@RequestBody List<BasePlaceInfo> basePlaceInfoList){
List<Long> ids = basePlaceInfoList.stream().map(BasePlaceInfo::getId).collect(Collectors.toList());
return toAjax(basePlaceInfoService.removeByIds(ids));
}
@GetMapping("/page")
public Page<BasePlaceInfo> selectPlaces(BasePlaceInfo basePlaceInfo){
Page<BasePlaceInfo> page = new Page<>(basePlaceInfo.getPageNum(), basePlaceInfo.getPageSize());
page = basePlaceInfoService.page(page, new QueryWrapper<>(basePlaceInfo));
return page;
}
@GetMapping("/type/{dictType}")
public AjaxResult selectPlaceType(@PathVariable String dictType){
List<SysDictData> sysDictData = iSysDictTypeService.selectDictDataByType(dictType);
Map<String, String> map = sysDictData.stream().collect(
Collectors.toMap
(SysDictData::getDictValue, SysDictData::getDictLabel, (V1, V2) -> V2));
return AjaxResult.success(map);
}
}

@ -1,18 +1,21 @@
package com.ruoyi.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.AES;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain.VillageImpUserInfo;
import com.ruoyi.system.service.VillageImpUserInfoService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@RestController
@ -55,7 +58,7 @@ public class VillageImpUserInfoController extends BaseController {
}
@GetMapping
public List<VillageImpUserInfo> selectUser(VillageImpUserInfo villageImpUserInfo) {
public Map<String, String> selectUser(VillageImpUserInfo villageImpUserInfo) {
if (villageImpUserInfo.getIdcard() != null) {
idCardEncrypt = AES.encrypt(villageImpUserInfo.getIdcard(), AES_KEY);
@ -63,20 +66,45 @@ public class VillageImpUserInfoController extends BaseController {
if (villageImpUserInfo.getPhone() != null) {
phoneEncrypt = AES.encrypt(villageImpUserInfo.getPhone(), AES_KEY);
}
List<VillageImpUserInfo> users = villageImpUserInfoService.getUsers(villageImpUserInfo.getId(),
villageImpUserInfo.getUserName(),
phoneEncrypt, idCardEncrypt);
Page<VillageImpUserInfo> page = new Page<>(villageImpUserInfo.getPageNum(), villageImpUserInfo.getPageSize());
Page<VillageImpUserInfo> userInfoPage = villageImpUserInfoService.page(page, new QueryWrapper<>(villageImpUserInfo));
List<VillageImpUserInfo> users = userInfoPage.getRecords();
for (VillageImpUserInfo userInfo : users) {
String idCardDecrypt = AES.decrypt(userInfo.getIdcard(), AES_KEY);
userInfo.setIdcard(idCardDecrypt);
String phoneDecrypt = AES.decrypt(userInfo.getPhone(), AES_KEY);
userInfo.setPhone(phoneDecrypt);
try {
String idCardDecrypt = AES.decrypt(userInfo.getIdcard(), AES_KEY);
userInfo.setIdcard(idCardDecrypt);
String phoneDecrypt = AES.decrypt(userInfo.getPhone(), AES_KEY);
userInfo.setPhone(phoneDecrypt);
} catch (Exception e) {
continue;
}
}
return users;
Map<String, String> map = users.stream()
.filter(e -> e.getIdentityType() == 1)
.collect(Collectors.toMap(VillageImpUserInfo::getUserName, VillageImpUserInfo::getIdcard, (V1,V2)->V2));
return map;
}
public static void main(String[] args) {
ArrayList<String> list1 = new ArrayList<>();
ArrayList<String> list2 = new ArrayList<>();
list1.add("1");
list1.add("4");
list1.add("9");
list1.add("7");
list2.add("4");
list2.add("9");
Collection<String> union = CollectionUtils.union(list1, list2);
System.out.println(union);
Collection<String> intersection = CollectionUtils.intersection(list1, list2);
System.out.println(intersection);
}
}

@ -0,0 +1,273 @@
package com.ruoyi.system.domain;
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 java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
/**
*
* @TableName base_place_info
*/
@TableName(value ="base_place_info")
@Data
public class BasePlaceInfo {
/**
*
*/
@TableId(type = IdType.AUTO)
private Long id;
/**
*
*/
private String placeCode;
/**
*
*/
private String placeName;
/**
*
*/
private String placePic;
/**
*
*/
private Integer placeCategory;
/**
*
*/
private Integer placeType;
/**
*
*/
private Integer placeNature;
/**
*
*/
private String coversAcreage;
/**
*
*/
private String structureAcreage;
/**
*
*/
private String neighBulitTime;
/**
*
*/
private String activeuseTime;
/**
*
*/
private Integer accessType;
/**
* 绿
*/
private String afforestationRate;
/**
*
*/
private String plotRate;
/**
*
*/
private BigDecimal longitude;
/**
*
*/
private BigDecimal latitude;
/**
*
*/
private String placeAddress;
/**
*
*/
private String provinceCode;
/**
*
*/
private String provinceName;
/**
*
*/
private String cityCode;
/**
*
*/
private String cityName;
/**
*
*/
private String areaCode;
/**
*
*/
private String areaName;
/**
* /
*/
private String streetCode;
/**
* /
*/
private String streetName;
/**
* /
*/
private String blockCode;
/**
* /
*/
private String blockName;
/**
*
*/
private String estateDeveloper;
/**
*
*/
private String developerPic;
/**
*
*/
private String developerName;
/**
*
*/
private String developerPhone;
/**
*
*/
private String propertyCompany;
/**
*
*/
private String propertyName;
/**
*
*/
private String propertyPhone;
/**
*
*/
private String propertyPic;
/**
*
*/
private String policeDistrict;
/**
*
*/
private String policeDistrictCode;
/**
*
*/
private String policeName;
/**
*
*/
private String policeNo;
/**
*
*/
private String policePhone;
/**
*
*/
private String policePic;
/**
*
*/
private String dimensoftVillageCode;
/**
* 20
*/
private String policeVillageCode;
/**
*
*/
private String jurisdictionalUnitCode;
/**
*
*/
private Date createTime;
/**
*
*/
private Integer createBy;
/**
*
*/
private Date updateTime;
/**
*
*/
private Integer updateBy;
/**
* 0:,1:
*/
private Integer isActive;
@TableField(exist = false)
private Long pageNum;
@TableField(exist = false)
private Long pageSize;
}

@ -3,6 +3,7 @@ package com.ruoyi.system.domain;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.SqlCondition;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
@ -21,7 +22,9 @@ public class VillageImpUserInfo extends Model<VillageImpUserInfo> {
//主键
@TableId(type = IdType.AUTO)
private Long id;
//人员姓名
@TableField(condition = SqlCondition.LIKE)
private String userName;
//人员照片
private String userPic;
@ -30,6 +33,7 @@ public class VillageImpUserInfo extends Model<VillageImpUserInfo> {
//证件类型
private Integer identityType;
//证件号码
@TableField(condition = SqlCondition.LIKE)
private String idcard;
//联系电话
private String phone;
@ -63,14 +67,5 @@ public class VillageImpUserInfo extends Model<VillageImpUserInfo> {
private Integer pageNum;
/**
*
*
* @return
*/
@Override
protected Serializable pkVal() {
return this.id;
}
}

@ -0,0 +1,18 @@
package com.ruoyi.system.mapper;
import com.ruoyi.system.domain.BasePlaceInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author 28758
* @description base_place_info()Mapper
* @createDate 2023-10-24 10:20:11
* @Entity com.watu.place.domain.BasePlaceInfo
*/
public interface BasePlaceInfoMapper extends BaseMapper<BasePlaceInfo> {
}

@ -0,0 +1,13 @@
package com.ruoyi.system.service;
import com.ruoyi.system.domain.BasePlaceInfo;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author 28758
* @description base_place_info()Service
* @createDate 2023-10-24 10:20:11
*/
public interface BasePlaceInfoService extends IService<BasePlaceInfo> {
}

@ -15,6 +15,5 @@ import java.util.List;
public interface VillageImpUserInfoService extends IService<VillageImpUserInfo> {
List<VillageImpUserInfo> getUsers(Long id, String userName, String phoneEncrypt, String idCardEncrypt);
}

@ -0,0 +1,21 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.BasePlaceInfoMapper;
import com.ruoyi.system.service.BasePlaceInfoService;
import com.ruoyi.system.domain.BasePlaceInfo;
import org.springframework.stereotype.Service;
/**
* @author 28758
* @description base_place_info()Service
* @createDate 2023-10-24 10:20:11
*/
@Service
public class BasePlaceInfoServiceImpl extends ServiceImpl<BasePlaceInfoMapper, BasePlaceInfo> implements BasePlaceInfoService {
}

@ -18,15 +18,5 @@ import java.util.List;
@Service("villageImpUserInfoService")
public class VillageImpUserInfoServiceImpl extends ServiceImpl<VillageImpUserInfoMapper, VillageImpUserInfo> implements VillageImpUserInfoService {
@Override
public List<VillageImpUserInfo> getUsers(Long id, String userName, String phoneEncrypt, String idCardEncrypt) {
return lambdaQuery()
.eq(id!=null,VillageImpUserInfo::getId,id)
.like(userName!=null,VillageImpUserInfo::getUserName,userName)
.eq(phoneEncrypt!=null,VillageImpUserInfo::getPhone,phoneEncrypt)
.eq(idCardEncrypt!=null,VillageImpUserInfo::getIdcard,idCardEncrypt)
.list();
}
}

Loading…
Cancel
Save