From b636e92e32c2a698e2590210037c471e45b9c88a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 13 Jun 2024 20:13:06 +0800
Subject: [PATCH] 在公安安全监管模块，增加校园场所管理模块
---
src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java | 3 +
src/main/java/org/springblade/modules/issueClazz/mapper/IssueClazzMapper.xml | 19 +++------
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 24 +++++------
src/main/java/org/springblade/modules/eCallEventTwo/entity/EcOrder.java | 9 ++++
src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcOrderMapper.xml | 3 +
src/main/java/org/springblade/modules/place/vo/PlaceVO.java | 8 ++++
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 10 +++-
7 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/entity/EcOrder.java b/src/main/java/org/springblade/modules/eCallEventTwo/entity/EcOrder.java
index f02f54e..f595cc4 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/entity/EcOrder.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/entity/EcOrder.java
@@ -30,7 +30,14 @@
* 工单ID
*/
@ApiModelProperty(value = "主键ID", example = "")
- @TableId(value = "order_id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 工单ID
+ */
+ @ApiModelProperty(value = "订单id", example = "")
+ @TableId(value = "order_id")
private Long orderId;
/**
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcOrderMapper.xml b/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcOrderMapper.xml
index 2077cd3..704432f 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcOrderMapper.xml
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcOrderMapper.xml
@@ -5,6 +5,7 @@
<mapper namespace="org.springblade.modules.eCallEventTwo.mapper.EcOrderMapper">
<resultMap type="org.springblade.modules.eCallEventTwo.dto.EcOrderDTO" id="EcOrderDTOResult">
+ <result property="id" column="id" />
<result property="orderId" column="order_id" />
<result property="orderCode" column="order_code" />
<result property="issueOrigin" column="issue_origin" />
@@ -59,7 +60,7 @@
</resultMap>
<sql id="selectEcOrder">
- select
+ select id,
order_id,
order_code,
issue_origin,
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java b/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
index 62fac35..3157730 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
@@ -117,7 +117,8 @@
for (int pageNum = 1; pageNum <= totalPages; pageNum++) {
Page<EcOrder> page = new Page<>(pageNum, pageSize);
- IPage<EcOrder> resultPage = baseMapper.selectPage(page, new QueryWrapper<>());
+ QueryWrapper<EcOrder> objectQueryWrapper = new QueryWrapper<>();
+ IPage<EcOrder> resultPage = baseMapper.selectPage(page, objectQueryWrapper);
List<EcOrder> records = resultPage.getRecords();
List<ECallEventTwoEntity> recordEntityList = BeanUtil.copy(records, ECallEventTwoEntity.class);
boolean b = ecOrderService.saveOrUpdateBatch(recordEntityList);
diff --git a/src/main/java/org/springblade/modules/issueClazz/mapper/IssueClazzMapper.xml b/src/main/java/org/springblade/modules/issueClazz/mapper/IssueClazzMapper.xml
index 71112a5..cc35e9b 100644
--- a/src/main/java/org/springblade/modules/issueClazz/mapper/IssueClazzMapper.xml
+++ b/src/main/java/org/springblade/modules/issueClazz/mapper/IssueClazzMapper.xml
@@ -22,19 +22,12 @@
<select id="tree" resultMap="treeNodeResultMap">
- SELECT
- id,
- NAME AS title,
- id AS "value",
- id AS "key",
- parentId
- FROM
- ( SELECT CODE id, NAME, parent_code parentId FROM jczz_issue_clazz ORDER BY parentId, id ) org_query,
- ( SELECT @id := '10' ) initialisation
- WHERE
- ( FIND_IN_SET( parentId, @id ) > 0 OR FIND_IN_SET( id, @id ) > 0 )
- AND @id := CONCAT( @id, ',', id)
-
+ SELECT CODE id,
+ NAME AS title,
+ CODE AS "value",
+ CODE AS "key",
+ parent_code parentId
+ FROM jczz_issue_clazz
</select>
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index ac6b359..10e1710 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -34,12 +34,16 @@
LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
left join (
select a.* from jczz_place_poi_label a inner join
- (
- select place_id,max(id) as id from jczz_place_poi_label b group by place_id
- ) b on a.id = b.id
+ ( select place_id,max(id) as id from jczz_place_poi_label b group by place_id ) b on a.id = b.id
) jppl on jppl.place_id = jp.id
where jp.is_deleted = 0 and jp.source!=3
and jp.place_name != ''
+ <if test="place.poiCodeList !=null and place.poiCodeList.size()>0">
+ and jppl.poi_code in
+ <foreach collection="place.poiCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </if>
<if test="place.placeName!=null and place.placeName!=''">
and jp.place_name like concat('%',#{place.placeName},'%')
</if>
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 c144e79..b6ead53 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
@@ -118,6 +118,9 @@
public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
// 公共参数设置
CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceVO.class, place);
+ if (StringUtils.isNotBlank(place.getPoiCodes())) {
+ place.setPoiCodeList(Arrays.asList(place.getPoiCodes().split(",")));
+ }
List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page,
place,
commonParamSet.getGridCodeList(),
@@ -206,7 +209,7 @@
// 保存从业人员
savePlacePractitioner(placeVO);
// 判断是否校园
- if (placeVO.getLabel().startsWith("1601")) {
+ if (placeVO.getLabel().startsWith("16010")) {
// 校园的新增一个主体用户和一个通用用户
addSchoolUser(placeVO);
}
@@ -724,12 +727,13 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public User addSchoolUser(PlaceVO placeVO) {
+ public void addSchoolUser(PlaceVO placeVO) {
User newUser = new User();
- if (StringUtils.isNotBlank(placeVO.getPlaceName())) {
-// placeVO.setPrincipal(placeVO.getPrincipal());
-// placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
- //如果用户不存在，则新增一个用户
+ // 查询账号是否存在，存在则不创建
+ long count = userService.count(Wrappers.<User>lambdaQuery()
+ .eq(User::getAccount, placeVO.getPlaceName() + "主体"));
+ // 如果用户不存在，则新增一个用户
+ if (StringUtils.isNotBlank(placeVO.getPlaceName()) && count <= 0) {
newUser.setAccount(placeVO.getPlaceName() + "主体");
newUser.setName(placeVO.getPlaceName() + "-主体");
newUser.setRealName(placeVO.getPlaceName() + "-主体");
@@ -737,8 +741,7 @@
newUser.setDeptId("1727979636479037441");
// 校园主体，
newUser.setRoleId("1780786647371706370");
-
- //默认密码为 123456
+ // 默认密码为 123456
newUser.setPassword("123456");
// 设置机构
// 用户新增
@@ -756,12 +759,7 @@
placeVO.setUniversalAccount(newUser.getId());
// 更新场所信息
updateById(placeVO);
- //绑定id
-// placeVO.setPrincipalUserId(newUser.getId());
- //给人员打上场所负责人的标签
-// baseMapper.saveUserLabel(newUser.getId(), 1002);
}
- return newUser;
}
/**
diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
index edd5fa0..210c838 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -17,6 +17,7 @@
package org.springblade.modules.place.vo;
import io.swagger.annotations.ApiModelProperty;
+import liquibase.pro.packaged.S;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
import org.springblade.modules.grid.vo.GridVO;
@@ -147,6 +148,7 @@
@ApiModelProperty(value = "机构名称")
private String deptName;
+
@ApiModelProperty(value = "地址")
private String addressName;
/**
@@ -159,6 +161,12 @@
*/
private String roleName;
+ @ApiModelProperty(value = "标签ids")
+ private String poiCodes;
+
+ @ApiModelProperty(value = "标签id集合")
+ private List<String> poiCodeList ;
+
/**
* 房屋绑定
*/
--
Gitblit v1.9.3