From a9f2cd13de09651a78463b3df4fd99aca826291c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 22 Apr 2021 18:29:17 +0800
Subject: [PATCH] 新增接口：根据处警人员编码删除电子围栏信息
---
blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java | 4 +-
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.xml | 7 +++
blade-common/src/main/java/org/springblade/common/entity/ParceLev.java | 3 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/service/impl/EnclosureServiceImpl.java | 11 +++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java | 3 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/service/IEnclosureService.java | 6 +++
blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java | 3 +
blade-ops/blade-report/src/main/java/org/springblade/report/feign/ReportClient.java | 3 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.java | 6 +++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/controller/EnclosureController.java | 16 ++++++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 12 ++++--
11 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/blade-common/src/main/java/org/springblade/common/entity/ParceLev.java b/blade-common/src/main/java/org/springblade/common/entity/ParceLev.java
index ccdb2c1..5a8e48d 100644
--- a/blade-common/src/main/java/org/springblade/common/entity/ParceLev.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/ParceLev.java
@@ -3,11 +3,12 @@
import lombok.AllArgsConstructor;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
@Data
@AllArgsConstructor
-public class ParceLev {
+public class ParceLev implements Serializable {
private String objName;
diff --git a/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java b/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
index 3d85628..32417be 100644
--- a/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
+++ b/blade-common/src/main/java/org/springblade/common/entity/ParcelExcel.java
@@ -8,6 +8,7 @@
import org.springblade.common.converter.ListToStringConverter;
import org.springblade.common.converter.ParcelMarkConverter;
+import java.io.Serializable;
import java.util.List;
/**
@@ -18,7 +19,7 @@
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
-public class ParcelExcel {
+public class ParcelExcel implements Serializable {
@ColumnWidth(20)
@ExcelProperty("安检机所在地")
diff --git a/blade-ops/blade-report/src/main/java/org/springblade/report/feign/ReportClient.java b/blade-ops/blade-report/src/main/java/org/springblade/report/feign/ReportClient.java
index d1cc773..573dd25 100644
--- a/blade-ops/blade-report/src/main/java/org/springblade/report/feign/ReportClient.java
+++ b/blade-ops/blade-report/src/main/java/org/springblade/report/feign/ReportClient.java
@@ -2,6 +2,7 @@
import org.springblade.common.entity.*;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -63,7 +64,7 @@
* @param body map集合数据
* @return
*/
- @PostMapping("getParcelList")
+ @PostMapping(value = "getParcelList",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
List<ParcelExcel> getParcelList(@RequestBody String body);
/**
diff --git a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
index 8e77fa9..1b8bf78 100644
--- a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
+++ b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
@@ -86,7 +86,6 @@
public List<HealthcodeExcel> getHealthcodeList(String beanName, String dataName, Map<String,Object> map){
//将map转换为json对象
String s = JSON.toJSONString(map);
- System.out.println("s = " + s);
if (null!=beanName){
return reportClient.getHealthcodeList(s);
}
@@ -152,7 +151,8 @@
//将map转换为json对象
String body = JSON.toJSONString(map);
if (null!=beanName){
- return reportClient.getParcelList(body);
+ List<ParcelExcel> parcelList = reportClient.getParcelList(body);
+ return parcelList;
}
return null;
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/controller/EnclosureController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/controller/EnclosureController.java
index 49dc1e5..f6a4e85 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/controller/EnclosureController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/controller/EnclosureController.java
@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
/**
* 控制器
@@ -127,6 +128,21 @@
/**
+ * 根据处警人员编号删除
+ * @param anumber 处警人员编号
+ */
+ @PostMapping("/deleteByAnumber")
+ @ApiOperation(value = "删除")
+ public R deleteByAnumber(@NotNull String anumber, HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ enclosureService.deleteByAnumber(anumber);
+ return R.success("删除成功");
+ }
+
+
+ /**
* 电子围栏新增
* @param anumber
* @param aname
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.java
index 0161304..cdedd06 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.java
@@ -50,4 +50,10 @@
* @return
*/
Enclosure selectEnclosureDetail(@Param("enclosure") Enclosure enclosure);
+
+ /**
+ * 根据处警人员编号删除
+ * @param anumber 处警人员编号
+ */
+ void deleteByAnumber(String anumber);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.xml
index a01c08e..8f91d0e 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/mapper/EnclosureMapper.xml
@@ -12,7 +12,7 @@
<select id="selectEnclosurePage" resultMap="enclosureResultMap">
- select * from sys_enclosure where is_deleted = 0
+ select * from sys_enclosure
</select>
<insert id="inserte">
@@ -36,4 +36,9 @@
</if>
</select>
+ <!--根据处警人员编号删除-->
+ <delete id="deleteByAnumber">
+ delete from sys_enclosure where anumber = #{anumber}
+ </delete>
+
</mapper>
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/service/IEnclosureService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/service/IEnclosureService.java
index c5b11d3..1c35ca6 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/service/IEnclosureService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/service/IEnclosureService.java
@@ -49,4 +49,10 @@
* @return
*/
Enclosure selectEnclosureDetail(Enclosure enclosure);
+
+ /**
+ * 根据处警人员编号删除
+ * @param anumber 处警人员编号
+ */
+ void deleteByAnumber(String anumber);
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/service/impl/EnclosureServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/service/impl/EnclosureServiceImpl.java
index 7d2d1e4..864ede0 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/service/impl/EnclosureServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/enclosure/service/impl/EnclosureServiceImpl.java
@@ -23,6 +23,7 @@
import org.springblade.jfpt.enclosure.service.IEnclosureService;
import org.springblade.jfpt.enclosure.vo.EnclosureVO;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -64,4 +65,14 @@
public Enclosure selectEnclosureDetail(Enclosure enclosure) {
return baseMapper.selectEnclosureDetail(enclosure);
}
+
+ /**
+ * 根据处警人员编号删除
+ * @param anumber 处警人员编号
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteByAnumber(String anumber) {
+ baseMapper.deleteByAnumber(anumber);
+ }
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
index c208f56..cb4660d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
@@ -194,7 +194,8 @@
//创建对象，并封装数据
ConditionVo conditionVo = getConditionVo(map);
//查询数据并返回数据
- return parcelService.exportParcel(conditionVo);
+ List<ParcelExcel> parcelExcels = parcelService.exportParcel(conditionVo);
+ return parcelExcels;
}
/**
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
index 0fbfe87..de7aa9d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java
@@ -16,6 +16,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.*;
import java.util.stream.Collectors;
import static org.springblade.core.tool.utils.DateUtil.now;
@@ -24,7 +25,7 @@
* 包裹服务实现层
*/
@Service
-public class ParcelServiceImpl implements ParcelService {
+public class ParcelServiceImpl implements ParcelService{
@Value("${PARCEL_KEY}")
private String PARCEL_KEY;
@@ -684,11 +685,11 @@
*/
@Override
public List<ParcelExcel> exportParcel(ConditionVo conditionVo) {
- System.out.println("conditionVo = " + conditionVo);
- ArrayList<List<ParcelExcel>> parcelExcelList = new ArrayList<>();
+ List<List<ParcelExcel>> parcelExcelList = new ArrayList<>();
//设置页码数
conditionVo.setCurrentPage(1);
conditionVo.setPageSize(100);
+ System.out.println("sysStartTIme = " + now());
//获取数据
Map<String,Object> result =(Map<String,Object>)getParcelDataPageList(conditionVo, PARCEL_DETAIL_RUL, PARCEL_KEY, PARCEL_SECRET).get("result");
if (null!=result) {
@@ -710,7 +711,7 @@
}
//合并集合
List<ParcelExcel> parcelExcels = parcelExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
- System.out.println("parcelExcels = " + parcelExcels);
+ System.out.println("sysEndTIme = " + now());
return parcelExcels;
}
return null;
@@ -724,6 +725,7 @@
public List<ParcelKindExcel> exportParcelKind(ConditionVo conditionVo) {
List<List<ParcelKindExcel>> parcelKindExcelList = new ArrayList<>();
List<ParcelKindExcel> list = new ArrayList<>();
+ System.out.println("sysStartTIme = " + now());
if(null!=conditionVo.getTimeDesc() && conditionVo.getTimeDesc()!="" && !conditionVo.getTimeDesc().equals("undefined") ){
//设置页码数
ConditionVo vo = new ConditionVo();
@@ -781,6 +783,7 @@
}
//合并集合并返回
List<ParcelKindExcel> parcelKindExcels = parcelKindExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
+ System.out.println("sysEndTIme = " + now());
return parcelKindExcels;
}
}
@@ -865,4 +868,5 @@
}
return list;
}
+
}
--
Gitblit v1.9.3