From bc91619c854cc2dbb01b20d0c47d76c4881e9ee8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java | 62 ++++++++++++++++++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/RegionVO.java | 4 ++
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintProgressServiceImpl.java | 7 +--
3 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java
index cbc75ff..c448c25 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java
@@ -417,6 +417,65 @@
log.info("获取行政区划层级联动数据：{}", list);
return R.ok(list);
}
+
+
+ @GetMapping("/getAdministrativeDivisionTwo")
+ @ApiOperation(value = "获取行政区划层级联动数据--2.0.1", tags = {"三个身边后台-人员管理"})
+ @ApiImplicitParams({
+ })
+ @OperLog(operModul = "三个身边后台",operType = 0,businessType = "获取行政区划层级联动数据--2.0.1")
+ public R<ArrayList<RegionVO>> getAdministrativeDivisionTwo(){
+ ArrayList<RegionVO> regionVOS = new ArrayList<>();
+
+ regionVOS.add(new RegionVO("1","市",new ArrayList<>(),1));
+ List<BcRegion> list = bcRegionService.list(new LambdaQueryWrapper<BcRegion>().eq(BcRegion::getDeleteFlag, 0));
+ ArrayList<RegionVO> regionList = new ArrayList<>();
+ list.forEach(e->{
+ RegionVO regionVO = new RegionVO();
+ regionVO.setId(e.getRegionCode());
+ regionVO.setName(e.getRegionName());
+ regionVO.setTier(2);
+ regionList.add(regionVO);
+ });
+ regionVOS.add(new RegionVO("2","区县",regionList,2));
+ List<ComStreet> list1 = comStreetService.list(new LambdaQueryWrapper<ComStreet>().in(ComStreet::getAreaCode, regionList.stream().map(RegionVO::getId).collect(Collectors.toList())));
+
+ for (RegionVO regionVO : regionList) {
+ ArrayList<RegionVO> list2 = new ArrayList<>();
+ List<ComStreet> collect = list1.stream().filter(e -> e.getAreaCode().toString().equals(regionVO.getId())).collect(Collectors.toList());
+ collect.forEach(e->{
+ RegionVO regionVO1 = new RegionVO();
+ regionVO1.setId(e.getStreetId());
+ regionVO1.setName(e.getName());
+ regionVO1.setTier(3);
+ list2.add(regionVO1);
+ });
+ regionVO.setChildren(list2);
+ }
+ regionVOS.add(new RegionVO("3","街道",regionList,3));
+ List<ComAct> list2 = comActService.list();
+
+ for (RegionVO regionVO : regionList) {
+ List<RegionVO> children = regionVO.getChildren();
+ for (RegionVO child : children) {
+ List<ComAct> collect = list2.stream().filter(e -> e.getStreetId().toString().equals(child.getId())).collect(Collectors.toList());
+ ArrayList<RegionVO> list3 = new ArrayList<>();
+ collect.forEach(e->{
+ RegionVO regionVO2 = new RegionVO();
+ regionVO2.setId(e.getCommunityId().toString());
+ regionVO2.setName(e.getName());
+ regionVO2.setTier(4);
+ list3.add(regionVO2);
+ });
+ child.setChildren(list3);
+ }
+ }
+ regionVOS.add(new RegionVO("4","社区",regionList,4));
+ return R.ok(regionVOS);
+ }
+
+
+
@GetMapping("/regionTree")
@ApiOperation(value = "获取区县-街道-社区树",tags = {"三个身边后台-人员管理"})
public R<List<RegionVO>> regionTree(){
@@ -435,7 +494,8 @@
String jsapiTicket = SignatureUtil.getJsApiTicket(accessToken);
String nonceStr = UUID.randomUUID().toString().replace("-", "");
String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
- String url = "https://huacheng.psciio.com/web/sangeshenbian/"; // 当前页面的URL，不包含#及其后面部分
+// String url = "https://huacheng.psciio.com/web/sangeshenbian/"; // 当前页面的URL，不包含#及其后面部分
+ String url = "http://192.168.110.91:8080/#/pages/Appeal/Appeal/"; // 当前页面的URL，不包含#及其后面部分
String signature = SignatureUtil.getSignature(jsapiTicket, nonceStr, timestamp, url);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/RegionVO.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/RegionVO.java
index da82061..42a2d41 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/RegionVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/RegionVO.java
@@ -2,7 +2,9 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
import java.util.List;
@@ -12,6 +14,8 @@
*/
@Data
@ApiModel("区域视图对象")
+@AllArgsConstructor
+@NoArgsConstructor
public class RegionVO {
@ApiModelProperty("主键id")
private String id;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintProgressServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintProgressServiceImpl.java
index 11bfc8c..b0ad241 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintProgressServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintProgressServiceImpl.java
@@ -1,13 +1,12 @@
package com.panzhihua.sangeshenbian.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.sangeshenbian.dao.ComplaintProgressMapper;
import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO;
import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
-import com.panzhihua.sangeshenbian.dao.ComplaintProgressMapper;
import com.panzhihua.sangeshenbian.service.IComplaintProgressService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.Objects;
@@ -24,7 +23,7 @@
public class ComplaintProgressServiceImpl extends ServiceImpl<ComplaintProgressMapper, ComplaintProgress> implements IComplaintProgressService {
@Override
public void edit(ComplaintProcessDTO dto) {
- if (Objects.nonNull(dto.getId())) {
+ if (Objects.isNull(dto.getId())) {
throw new ServiceException("办理进度id不能为空");
}
ComplaintProgress complaintProgress = BeanUtil.copyProperties(dto, ComplaintProgress.class);
--
Gitblit v1.7.1