From adda3ce6f8b337dd7c6f238716d37bd520b8e7eb Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 15 Mar 2024 16:41:39 +0800
Subject: [PATCH] 报警记录添加字段+从业人员修改信息更新生日
---
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 23 ++++---
src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java | 11 +--
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 5 +
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml | 4
src/main/java/org/springblade/modules/police/entity/PoliceAlarmRecordsEntity.java | 7 ++
src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java | 6 +-
src/main/java/org/springblade/modules/police/service/IPoliceAlarmRecordsService.java | 7 +-
src/main/java/org/springblade/modules/police/dto/PoliceAlarmRecordsDTO.java | 18 ++++++
/dev/null | 34 -----------
src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml | 33 ++++++++---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 2
src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java | 5 -
src/main/java/org/springblade/modules/police/wrapper/PoliceAlarmRecordsWrapper.java | 6 +-
src/main/java/org/springblade/modules/police/service/impl/PoliceAlarmRecordsServiceImpl.java | 11 +--
14 files changed, 89 insertions(+), 83 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
index 8c81bf1..f243d1c 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
@@ -10,7 +10,7 @@
jpp.name,
jpp.telephone,
jpp.temp_address,
- (YEAR(CURDATE()) - YEAR(jpp.birthday))age,
+ TRUNCATE( DATEDIFF( CURDATE(), jpp.birthday )/ 365.2422,0 ) age,
jpp.gender,
jpp.id_card,
jpp.card_type,
@@ -75,7 +75,7 @@
<if test="placePractitioner.ethnicity != null ">and jpp.ethnicity = #{placePractitioner.ethnicity}</if>
<if test="placePractitioner.type == 1">
- and (YEAR(CURDATE()) - YEAR(jpp.birthday)) < 18
+ and (CURDATE() < DATE_ADD( jpp.birthday, INTERVAL 18 YEAR )
and jc.category_no in (180202,180201)
</if>
<if test="placePractitioner.type == 2">
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
index 3d90109..e38134c 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
@@ -19,9 +19,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.param.CommonParamSet;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
@@ -101,8 +103,8 @@
CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(PlaceExtVO.class, placeExt);
- return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt,commonParamSet.getRegionChildCodesList(),
- commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList()));
+ return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList()));
}
/**
@@ -138,15 +140,16 @@
// 找出需要新增的，否则组成新集合进行比对
for (PlacePractitionerEntity practitionerEntity : list) {
practitionerEntity.setPlaceId(placeExt.getPlaceId());
+ if (StringUtils.isNotBlank(practitionerEntity.getIdCard())) {
+ // 从身份证号获取出生日期
+ String birthDateStr = practitionerEntity.getIdCard().substring(6, 14);
+ // 解析出生日期字符串为日期对象
+ practitionerEntity.setBirthday(DateUtil.parse(birthDateStr, "yyyyMMdd"));
+ }
if (null == practitionerEntity.getId()) {
// 新增
- PlacePractitionerEntity placePractitionerEntity = new PlacePractitionerEntity();
-
- placePractitionerEntity.setPlaceId(placeExt.getPlaceId());
- placePractitionerEntity.setName(practitionerEntity.getName());
- placePractitionerEntity.setTelephone(practitionerEntity.getTelephone());
- placePractitionerEntity.setTempAddress(practitionerEntity.getTempAddress());
- addList.add(placePractitionerEntity);
+ practitionerEntity.setPlaceId(placeExt.getPlaceId());
+ addList.add(practitionerEntity);
} else {
newList.add(practitionerEntity);
}
@@ -279,6 +282,6 @@
placeExt.setConfirmFlag(confirmFlag);
placeExt.setNeiCode(neiCode);
CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(PlaceExtVO.class, placeExt);
- return baseMapper.selectCount(placeExt,commonParamSet.getRegionChildCodesList(),commonParamSet.getIsAdministrator(),commonParamSet.getGridCodeList());
+ return baseMapper.selectCount(placeExt, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
}
}
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 13cae12..91c24b1 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -875,6 +875,11 @@
QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_deleted", 0).eq("place_id", placeVO.getId());
placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
+ // 查询从业人员
+ IPlacePractitionerService placePractitionerService = SpringUtils.getBean(IPlacePractitionerService.class);
+ List<PlacePractitionerEntity> entityList = placePractitionerService.list(Wrappers.<PlacePractitionerEntity>lambdaQuery()
+ .eq(PlacePractitionerEntity::getPlaceId, placeVO.getId()));
+ placeVO.setPlacePractitioner(entityList);
// 查询绑定的房屋
placeVO.setHouseBindList(baseMapper.getHouseBindMap(placeVO.getHouseCodeBinds()));
}
diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/controller/PoliceAlarmRecordsController.java b/src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java
similarity index 90%
rename from src/main/java/org/springblade/modules/policeAlarmRecords/controller/PoliceAlarmRecordsController.java
rename to src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java
index b43db70..366fc5e 100644
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/controller/PoliceAlarmRecordsController.java
+++ b/src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java
@@ -14,7 +14,7 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.policeAlarmRecords.controller;
+package org.springblade.modules.police.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,17 +23,16 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
-import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
-import org.springblade.modules.policeAlarmRecords.vo.PoliceAlarmRecordsVO;
-import org.springblade.modules.policeAlarmRecords.wrapper.PoliceAlarmRecordsWrapper;
-import org.springblade.modules.policeAlarmRecords.service.IPoliceAlarmRecordsService;
+import org.springblade.modules.police.entity.PoliceAlarmRecordsEntity;
+import org.springblade.modules.police.vo.PoliceAlarmRecordsVO;
+import org.springblade.modules.police.wrapper.PoliceAlarmRecordsWrapper;
+import org.springblade.modules.police.service.IPoliceAlarmRecordsService;
import org.springblade.core.boot.ctrl.BladeController;
/**
diff --git a/src/main/java/org/springblade/modules/police/dto/PoliceAlarmRecordsDTO.java b/src/main/java/org/springblade/modules/police/dto/PoliceAlarmRecordsDTO.java
new file mode 100644
index 0000000..03dbbf9
--- /dev/null
+++ b/src/main/java/org/springblade/modules/police/dto/PoliceAlarmRecordsDTO.java
@@ -0,0 +1,18 @@
+package org.springblade.modules.police.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.modules.police.entity.PoliceAlarmRecordsEntity;
+
+/**
+ * 报警记录 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2024-03-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PoliceAlarmRecordsDTO extends PoliceAlarmRecordsEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/entity/PoliceAlarmRecordsEntity.java b/src/main/java/org/springblade/modules/police/entity/PoliceAlarmRecordsEntity.java
similarity index 94%
rename from src/main/java/org/springblade/modules/policeAlarmRecords/entity/PoliceAlarmRecordsEntity.java
rename to src/main/java/org/springblade/modules/police/entity/PoliceAlarmRecordsEntity.java
index fe955fe..1be5eaf 100644
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/entity/PoliceAlarmRecordsEntity.java
+++ b/src/main/java/org/springblade/modules/police/entity/PoliceAlarmRecordsEntity.java
@@ -14,7 +14,7 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.policeAlarmRecords.entity;
+package org.springblade.modules.police.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -132,4 +132,9 @@
@TableField("alarm_describe")
private String alarmDescribe;
+ /** 公安事件：1：否 2：是 */
+ @ApiModelProperty(value = "公安事件：1：否 2：是", example = "")
+ @TableField("public_incidents")
+ private Integer publicIncidents;
+
}
diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.java b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java
similarity index 85%
rename from src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.java
rename to src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java
index b0460d8..e8f2071 100644
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.java
+++ b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java
@@ -14,10 +14,10 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.policeAlarmRecords.mapper;
+package org.springblade.modules.police.mapper;
-import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
-import org.springblade.modules.policeAlarmRecords.vo.PoliceAlarmRecordsVO;
+import org.springblade.modules.police.entity.PoliceAlarmRecordsEntity;
+import org.springblade.modules.police.vo.PoliceAlarmRecordsVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.xml b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
similarity index 71%
rename from src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.xml
rename to src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
index c321c3f..18389d4 100644
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/mapper/PoliceAlarmRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.policeAlarmRecords.mapper.PoliceAlarmRecordsMapper">
+<mapper namespace="org.springblade.modules.police.mapper.PoliceAlarmRecordsMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="policeAlarmRecordsResultMap" type="org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity">
+ <resultMap id="policeAlarmRecordsResultMap" type="org.springblade.modules.police.entity.PoliceAlarmRecordsEntity">
</resultMap>
@@ -11,7 +11,7 @@
select * from jczz_police_alarm_records where is_deleted = 0
</select>
- <resultMap type="org.springblade.modules.policeAlarmRecords.dto.PoliceAlarmRecordsDTO" id="PoliceAlarmRecordsDTOResult">
+ <resultMap type="org.springblade.modules.police.dto.PoliceAlarmRecordsDTO" id="PoliceAlarmRecordsDTOResult">
<result property="id" column="id" />
<result property="houseCode" column="house_code" />
<result property="address" column="address" />
@@ -30,6 +30,7 @@
<result property="jwGridCode" column="jw_grid_code" />
<result property="alarmResponseTime" column="alarm_response_time" />
<result property="alarmDescribe" column="alarm_describe" />
+ <result property="publicIncidents" column="public_incidents" />
</resultMap>
<sql id="selectPoliceAlarmRecords">
@@ -42,10 +43,17 @@
alarm_type,
injury_flag,
grid_code,
- is_deleted,
- police_id,
create_time,
- update_time
+ update_time,
+ police_id,
+ police_name,
+ police_phone,
+ is_deleted,
+ gender,
+ jw_grid_code,
+ alarm_response_time,
+ alarm_describe,
+ public_incidents
from
jczz_police_alarm_records
</sql>
@@ -56,7 +64,7 @@
<!-- id = #{id}-->
<!-- </select>-->
-<!-- <select id="selectPoliceAlarmRecordsList" parameterType="org.springblade.modules.policeAlarmRecords.dto.PoliceAlarmRecordsDTO" resultMap="PoliceAlarmRecordsDTOResult">-->
+<!-- <select id="selectPoliceAlarmRecordsList" parameterType="rg.springblade.modules.dto.PoliceAlarmRecordsDTO" resultMap="PoliceAlarmRecordsDTOResult">-->
<!-- <include refid="selectPoliceAlarmRecords"/>-->
<!-- <where>-->
<!-- <if test="id != null "> and id = #{id}</if>-->
@@ -67,10 +75,17 @@
<!-- <if test="alarmType != null and alarmType != ''"> and alarm_type = #{alarmType}</if>-->
<!-- <if test="injuryFlag != null "> and injury_flag = #{injuryFlag}</if>-->
<!-- <if test="gridCode != null and gridCode != ''"> and grid_code = #{gridCode}</if>-->
-<!-- <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>-->
-<!-- <if test="policeId != null "> and police_id = #{policeId}</if>-->
<!-- <if test="createTime != null "> and create_time = #{createTime}</if>-->
<!-- <if test="updateTime != null "> and update_time = #{updateTime}</if>-->
+<!-- <if test="policeId != null "> and police_id = #{policeId}</if>-->
+<!-- <if test="policeName != null and policeName != ''"> and police_name = #{policeName}</if>-->
+<!-- <if test="policePhone != null and policePhone != ''"> and police_phone = #{policePhone}</if>-->
+<!-- <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>-->
+<!-- <if test="gender != null "> and gender = #{gender}</if>-->
+<!-- <if test="jwGridCode != null and jwGridCode != ''"> and jw_grid_code = #{jwGridCode}</if>-->
+<!-- <if test="alarmResponseTime != null "> and alarm_response_time = #{alarmResponseTime}</if>-->
+<!-- <if test="alarmDescribe != null and alarmDescribe != ''"> and alarm_describe = #{alarmDescribe}</if>-->
+<!-- <if test="publicIncidents != null "> and public_incidents = #{publicIncidents}</if>-->
<!-- </where>-->
<!-- </select>-->
diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/service/IPoliceAlarmRecordsService.java b/src/main/java/org/springblade/modules/police/service/IPoliceAlarmRecordsService.java
similarity index 83%
rename from src/main/java/org/springblade/modules/policeAlarmRecords/service/IPoliceAlarmRecordsService.java
rename to src/main/java/org/springblade/modules/police/service/IPoliceAlarmRecordsService.java
index 5472731..1830dfd 100644
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/service/IPoliceAlarmRecordsService.java
+++ b/src/main/java/org/springblade/modules/police/service/IPoliceAlarmRecordsService.java
@@ -14,12 +14,11 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.policeAlarmRecords.service;
+package org.springblade.modules.police.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
-import org.springblade.modules.policeAlarmRecords.vo.PoliceAlarmRecordsVO;
-import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.police.entity.PoliceAlarmRecordsEntity;
+import org.springblade.modules.police.vo.PoliceAlarmRecordsVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
/**
diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/service/impl/PoliceAlarmRecordsServiceImpl.java b/src/main/java/org/springblade/modules/police/service/impl/PoliceAlarmRecordsServiceImpl.java
similarity index 77%
rename from src/main/java/org/springblade/modules/policeAlarmRecords/service/impl/PoliceAlarmRecordsServiceImpl.java
rename to src/main/java/org/springblade/modules/police/service/impl/PoliceAlarmRecordsServiceImpl.java
index a4ba3e4..d7fa280 100644
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/service/impl/PoliceAlarmRecordsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/police/service/impl/PoliceAlarmRecordsServiceImpl.java
@@ -14,14 +14,13 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.policeAlarmRecords.service.impl;
+package org.springblade.modules.police.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
-import org.springblade.modules.policeAlarmRecords.vo.PoliceAlarmRecordsVO;
-import org.springblade.modules.policeAlarmRecords.mapper.PoliceAlarmRecordsMapper;
-import org.springblade.modules.policeAlarmRecords.service.IPoliceAlarmRecordsService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.police.entity.PoliceAlarmRecordsEntity;
+import org.springblade.modules.police.vo.PoliceAlarmRecordsVO;
+import org.springblade.modules.police.mapper.PoliceAlarmRecordsMapper;
+import org.springblade.modules.police.service.IPoliceAlarmRecordsService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/vo/PoliceAlarmRecordsVO.java b/src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java
similarity index 85%
rename from src/main/java/org/springblade/modules/policeAlarmRecords/vo/PoliceAlarmRecordsVO.java
rename to src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java
index f23b69c..69f71a7 100644
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/vo/PoliceAlarmRecordsVO.java
+++ b/src/main/java/org/springblade/modules/police/vo/PoliceAlarmRecordsVO.java
@@ -14,10 +14,9 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.policeAlarmRecords.vo;
+package org.springblade.modules.police.vo;
-import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
-import org.springblade.core.tool.node.INode;
+import org.springblade.modules.police.entity.PoliceAlarmRecordsEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/wrapper/PoliceAlarmRecordsWrapper.java b/src/main/java/org/springblade/modules/police/wrapper/PoliceAlarmRecordsWrapper.java
similarity index 89%
rename from src/main/java/org/springblade/modules/policeAlarmRecords/wrapper/PoliceAlarmRecordsWrapper.java
rename to src/main/java/org/springblade/modules/police/wrapper/PoliceAlarmRecordsWrapper.java
index 52d5a06..3d6bc6d 100644
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/wrapper/PoliceAlarmRecordsWrapper.java
+++ b/src/main/java/org/springblade/modules/police/wrapper/PoliceAlarmRecordsWrapper.java
@@ -14,12 +14,12 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.modules.policeAlarmRecords.wrapper;
+package org.springblade.modules.police.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
-import org.springblade.modules.policeAlarmRecords.vo.PoliceAlarmRecordsVO;
+import org.springblade.modules.police.entity.PoliceAlarmRecordsEntity;
+import org.springblade.modules.police.vo.PoliceAlarmRecordsVO;
import java.util.Objects;
/**
diff --git a/src/main/java/org/springblade/modules/policeAlarmRecords/dto/PoliceAlarmRecordsDTO.java b/src/main/java/org/springblade/modules/policeAlarmRecords/dto/PoliceAlarmRecordsDTO.java
deleted file mode 100644
index 4ff11c0..0000000
--- a/src/main/java/org/springblade/modules/policeAlarmRecords/dto/PoliceAlarmRecordsDTO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.modules.policeAlarmRecords.dto;
-
-import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 报警记录 数据传输对象实体类
- *
- * @author BladeX
- * @since 2024-03-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class PoliceAlarmRecordsDTO extends PoliceAlarmRecordsEntity {
- private static final long serialVersionUID = 1L;
-
-}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index c66edb9..5197b16 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -52,8 +52,6 @@
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
-import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
-import org.springblade.modules.policeAlarmRecords.service.IPoliceAlarmRecordsService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.*;
--
Gitblit v1.9.3