From ae0a308278e39b89d2e7dda7b09baed72ae44edd Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Feb 2022 15:30:23 +0800
Subject: [PATCH] update
---
screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java | 47 +++++++++++++++++++----------------------------
1 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
index 92d2d94..e6df36e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
@@ -2,11 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
import com.moral.api.entity.Supervision;
import com.moral.api.mapper.SupervisionMapper;
-import com.moral.api.service.MonitorPointService;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.SupervisionService;
@@ -51,9 +49,6 @@
@Autowired
private OrganizationService organizationService;
- @Autowired
- private MonitorPointService monitorPointService;
-
@Override
@Transactional
public Map<String, Object> add(MultipartFile[] files, Supervision supervision) {
@@ -64,8 +59,16 @@
Map<String, Object> result = new HashMap<>();
- List<String> images = new ArrayList<>();
+ //���������������������
+ QueryWrapper<Supervision> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("number", supervision.getNumber()).eq("is_delete", Constants.NOT_DELETE);
+ if (supervisionMapper.selectOne(queryWrapper) != null) {
+ result.put("code", ResponseCodeEnum.SUPERVISION_NUMBER_EXIT.getCode());
+ result.put("msg", ResponseCodeEnum.SUPERVISION_NUMBER_EXIT.getMsg());
+ return result;
+ }
+ List<String> images = new ArrayList<>();
for (MultipartFile file : files) {
//������������������������
String fileType = file.getContentType();
@@ -93,6 +96,8 @@
.collect(Collectors.joining(","));
supervision.setImages(image);
}
+
+
supervisionMapper.insert(supervision);
return result;
}
@@ -104,30 +109,17 @@
int size = Integer.parseInt(params.get("size").toString());
Object start = params.get("start");
Object end = params.get("end");
+ Integer orgId = Integer.parseInt(params.get("organizationId").toString());
+ //������������������������������
+ List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
+ List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
+ orgIds.add(orgId);
QueryWrapper<Supervision> supervisionQueryWrapper = new QueryWrapper<>();
- supervisionQueryWrapper.eq("is_delete", Constants.NOT_DELETE);
- if (params.get("organizationId") != null) {
- Integer orgId = Integer.parseInt(params.get("organizationId").toString());
- //������������������������������
- List<Organization> organizations = organizationService.getChildrenOrganizationsById(orgId);
- List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
- orgIds.add(orgId);
- QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("city_code")
- .eq("is_delete", Constants.NOT_DELETE)
- .in("organization_id", orgIds);
-
- //������������id������������������������code
- List<Object> cityCodes = monitorPointService.listObjs(queryWrapper);
-
- cityCodes = cityCodes.stream()
- .distinct()
- .collect(Collectors.toList());
-
- supervisionQueryWrapper.in("CONCAT(LEFT(city_code,4),'00')", cityCodes);
- } else {
+ supervisionQueryWrapper.eq("is_delete", Constants.NOT_DELETE).in("organization_id", orgIds);
+ //���������������������������������������������������������������������������������������������������������������������������
+ if (params.get("cityCode") != null) {
String cityCode = params.get("cityCode").toString();
//���������������������������������������������������������������������������������������
if (cityCode.endsWith("00")) {
@@ -136,7 +128,6 @@
supervisionQueryWrapper.eq("city_code", cityCode);
}
}
-
if (start != null) {
supervisionQueryWrapper.ge("time", start);
--
Gitblit v1.8.0