From 1ceb6ae074bc40a687852ce0fcef1ff2aa9c5840 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 17:29:37 +0800
Subject: [PATCH] 1.客户列表接口修改，新增返回字段 deptName 2.删除 system.out... 以往语句
---
blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java | 10 +++++
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java | 3 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/HttpClientUtils.java | 7 ---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/pie/JFreeChartUtil.java | 1
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RecordVideoThread.java | 1
blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java | 3 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 1
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 2 -
blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java | 1
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/service/impl/ParcelServiceImpl.java | 5 --
blade-ops/blade-report/src/main/resources/application.yml | 1
blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml | 11 ++++-
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java | 5 +-
blade-service/blade-system/src/main/java/org/springblade/system/vo/TenantVo.java | 10 +++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java | 1
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java | 2 -
blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java | 3 +
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java | 5 ++
18 files changed, 43 insertions(+), 29 deletions(-)
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 1b8bf78..7b6c850 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
@@ -12,6 +12,8 @@
import org.springblade.report.service.ReportFileService;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -151,6 +153,14 @@
//将map转换为json对象
String body = JSON.toJSONString(map);
if (null!=beanName){
+// List<ParcelExcel> parcelExcels = new ArrayList<>();
+// ParcelExcel parcelExcel = new ParcelExcel();
+// parcelExcel.setCheckMachineCode("ceshi");
+// parcelExcel.setCheckMachineName("ceshi");
+// parcelExcel.setCheckMachinePosition("ceshi");
+// parcelExcel.setImgUrl("ceshi");
+// parcelExcel.setDecisioDiagramResultDetails("ceshi");
+// parcelExcels.add(parcelExcel);
List<ParcelExcel> parcelList = reportClient.getParcelList(body);
return parcelList;
}
diff --git a/blade-ops/blade-report/src/main/resources/application.yml b/blade-ops/blade-report/src/main/resources/application.yml
index 027a146..d31c89e 100644
--- a/blade-ops/blade-report/src/main/resources/application.yml
+++ b/blade-ops/blade-report/src/main/resources/application.yml
@@ -8,3 +8,4 @@
database:
provider:
prefix: blade-
+
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index 5fa76a6..08555c3 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -676,7 +676,6 @@
SimpleDateFormat sdf = new SimpleDateFormat();// 格式化时间
sdf.applyPattern("yyyy-MM-dd HH:mm:ss");// a为am/pm的标记
Date date = new Date();// 获取当前时间
- //System.out.println("现在时间：" + sdf.format(date)); // 输出已经格式化的现在时间（24小时制）
Operation operation = new Operation();
operation.setJid(alarmVO.getId().toString());
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
index 0f4ca6c..5093554 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java
@@ -48,7 +48,6 @@
int length = body.length();
//3.截取,由于获取数据时，｝ 被去除，需要加上
String dataBody = body.substring(i, length)+"}";
- System.out.println("dataBody = " + dataBody);
//4.数据转换
Map<String,Object> data = (Map<String, Object>) JSONObject.parse(dataBody);
//5.创建体温数据对象
@@ -198,7 +197,6 @@
//遍历集合
for (BladeAnimalHeat animalHeat:collect) {
try {
- System.out.println("animalHeat.getCreateTime() = " + animalHeat.getCreateTime());
long hours = animalHeat.getCreateTime().getHours();
if (hours>0 && hours< AlarmTimeConstant.TWO){
count02+=1;
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java
index 0617cf4..87df662 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/util/ImageUtil.java
@@ -43,7 +43,6 @@
File w2 = new File("D://"+PRE_URL+StringPool.SLASH+ UUID+".jpg");
//判断父文件夹存在与否
File parentFile = w2.getParentFile();
- System.out.println("parentFile = " + parentFile);
if (!parentFile.exists()){
//如果不存在，则创建
parentFile.mkdirs();
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index 337de19..189c26c 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -364,7 +364,6 @@
// catalogService.updateCatalog(deviceName,deviceNumber,pId);
// }
- System.out.println(equipment.getDeptId());
return R.status(equipmentService.saveOrUpdate(equipment));
}
@@ -400,7 +399,6 @@
equipmentService.saveImg(equipment);
}
- System.out.println(equipment.getDeptId());
return R.status(equipmentService.saveOrUpdate(equipment));
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
index 919a34d..d886be7 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/controller/ParcelController.java
@@ -13,6 +13,8 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import static java.time.LocalDate.now;
+
/**
* @title 包裹控制层
* @author arsn
@@ -105,7 +107,9 @@
*/
@GetMapping("/export-parcel")
public void exportParcel(ConditionVo conditionVo, HttpServletResponse response){
+ System.out.println("parStart = " + now());
List<ParcelExcel> list = parcelService.exportParcel(conditionVo);
+ System.out.println("parEnd = " + now());
ExcelUtil.export(response, "包裹数据" + DateUtil.time(), "包裹数据表", list, ParcelExcel.class);
}
@@ -117,7 +121,6 @@
@GetMapping("/export-parcelKind")
public void exportParcelKind(ConditionVo conditionVo, HttpServletResponse response){
List<ParcelKindExcel> parcelKindExcelList = parcelService.exportParcelKind(conditionVo);
- System.out.println("parcelKindExcelList = " + parcelKindExcelList);
ExcelUtil.export(response, "违禁品数据" + DateUtil.time(), "违禁品数据表", parcelKindExcelList, ParcelKindExcel.class);
}
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 de7aa9d..da4f6ab 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
@@ -350,7 +350,6 @@
map.put("imgKey",imgKey);
//执行http远程调用
String s = HttpClientUtils.doGetHeaderPictureBase64(PARCEL_PICTURE_URL, PARCEL_KEY, PARCEL_SECRET, map);
- System.out.println("s = " + s);
if (null==s || s=="" || s.isEmpty()){
return null;
}
@@ -689,7 +688,6 @@
//设置页码数
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) {
@@ -711,7 +709,6 @@
}
//合并集合
List<ParcelExcel> parcelExcels = parcelExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
- System.out.println("sysEndTIme = " + now());
return parcelExcels;
}
return null;
@@ -725,7 +722,6 @@
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();
@@ -783,7 +779,6 @@
}
//合并集合并返回
List<ParcelKindExcel> parcelKindExcels = parcelKindExcelList.stream().flatMap(List::stream).collect(Collectors.toList());
- System.out.println("sysEndTIme = " + now());
return parcelKindExcels;
}
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/HttpClientUtils.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/HttpClientUtils.java
index 67707df..ad94c16 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/HttpClientUtils.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/parcel/util/HttpClientUtils.java
@@ -70,7 +70,6 @@
response = httpclient.execute(get);
- System.out.println(response.getStatusLine());
if (200 == response.getStatusLine().getStatusCode()) {
HttpEntity entity = response.getEntity();
@@ -277,8 +276,6 @@
response = httpclient.execute(post);
- System.out.println(response.getStatusLine());
-
if (200 == response.getStatusLine().getStatusCode()) {
HttpEntity entity = response.getEntity();
resultString = EntityUtils.toString(entity, "utf-8");
@@ -316,8 +313,6 @@
Map<String, String> params = new HashMap<>();
params.put("scope", "project");
params.put("q", "数据库");
-//
-// System.out.println(doGet("http://www.baidu.com/s",params));
/**
* 有一部分网站，禁止爬虫技术访问网站。
@@ -481,9 +476,7 @@
param.append(entry.getKey());
param.append("=");
param.append(entry.getValue());
- // System.out.println(entry.getKey()+":"+entry.getValue());
}
- // System.out.println("param:"+param.toString());
out.write(param.toString());
}
// flush输出流的缓冲
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/pie/JFreeChartUtil.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/pie/JFreeChartUtil.java
index 1b895f4..277d127 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/pie/JFreeChartUtil.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/pie/JFreeChartUtil.java
@@ -80,7 +80,6 @@
try {
// 将图表写入到ByteArrayOutputStream流中
ChartUtilities.writeChartAsJPEG(bos, chart, 800, 700);
- System.out.println("bos = " + bos);
InputStream inputStream = new ByteArrayInputStream(bos.toByteArray());
String fileName = "imageWrite" + System.currentTimeMillis() + ".xlsx";
imageData.setInputStream(inputStream);
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RecordVideoThread.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RecordVideoThread.java
index 7223e4e..b03659a 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RecordVideoThread.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/rvideo/controller/RecordVideoThread.java
@@ -23,7 +23,6 @@
@Override
public void run() {
- System.out.println(streamURL);
// 获取视频源
FFmpegFrameGrabber grabber = new FFmpegFrameGrabber(streamURL);
FFmpegFrameRecorder recorder = null;
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
index ad81681..db0fd4e 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
@@ -127,7 +127,6 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "树形结构", notes = "树形结构")
public R<List<DeptVO>> trees(String tenantId, BladeUser bladeUser) {
- System.out.println("tenantId = " + tenantId);
List<DeptVO> tree = deptService.trees();
return R.data(tree);
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
index 7fe643f..edbc9e5 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
@@ -37,6 +37,7 @@
import org.springblade.system.entity.Tenant;
import org.springblade.system.service.ITenantService;
import org.springblade.system.vo.RoleVO;
+import org.springblade.system.vo.TenantVo;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -115,8 +116,8 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "分页", notes = "传入tenant")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<Tenant>> page(Tenant tenant, Query query) throws ParseException {
- IPage<Tenant> pages = tenantService.selectTenantPage(Condition.getPage(query), tenant);
+ public R<IPage<TenantVo>> page(Tenant tenant, Query query) throws ParseException {
+ IPage<TenantVo> pages = tenantService.selectTenantPage(Condition.getPage(query), tenant);
return R.data(pages);
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java
index b59eb93..eee3815 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.system.entity.Tenant;
+import org.springblade.system.vo.TenantVo;
import java.util.List;
import java.util.Map;
@@ -37,7 +38,7 @@
* @param tenant
* @return
*/
- List<Tenant> selectTenantPage(IPage page, Tenant tenant);
+ List<TenantVo> selectTenantPage(IPage page, Tenant tenant);
List<Map<String, Object>> selectListTe(String type);
int inserts(String dj, String had, String ht, String ctime,String content,String hn);
void updateInfoy(String dj, String had, String ht, String ctime,String content,String hn);
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml
index beb426c..f2173fb 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml
@@ -30,8 +30,15 @@
</resultMap>
- <select id="selectTenantPage" resultMap="tenantResultMap">
- select * from blade_tenant where is_deleted = 0 and tenant_id!=000000
+ <select id="selectTenantPage" resultType="org.springblade.system.vo.TenantVo">
+ select bt.*,bd.id deptId from blade_tenant bt
+ left join
+ blade_dept bd
+ on
+ bt.tenant_id=bd.tenant_id
+ where bt.is_deleted = 0
+ and bt.tenant_id!=000000
+ and bd.dept_category=1
<if test="tenant.tenantName!=null and tenant.tenantName!=''">
and tenant_name=#{tenant.tenantName}
</if>
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
index 09c75f4..ed3acbe 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
import org.springblade.system.entity.Tenant;
+import org.springblade.system.vo.TenantVo;
import java.util.Date;
import java.util.List;
@@ -38,7 +39,7 @@
* @param tenant
* @return
*/
- IPage<Tenant> selectTenantPage(IPage<Tenant> page, Tenant tenant);
+ IPage<TenantVo> selectTenantPage(IPage<TenantVo> page, Tenant tenant);
/**
* 根据租户编号获取实体
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
index dc2824a..95eda8f 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
@@ -38,6 +38,7 @@
import org.springblade.system.user.entity.User;
import org.springblade.system.user.enums.UserEnum;
import org.springblade.system.user.feign.IUserClient;
+import org.springblade.system.vo.TenantVo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -66,7 +67,7 @@
private final IUserClient userClient;
@Override
- public IPage<Tenant> selectTenantPage(IPage<Tenant> page, Tenant tenant) {
+ public IPage<TenantVo> selectTenantPage(IPage<TenantVo> page, Tenant tenant) {
return page.setRecords(baseMapper.selectTenantPage(page, tenant));
}
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/vo/TenantVo.java b/blade-service/blade-system/src/main/java/org/springblade/system/vo/TenantVo.java
new file mode 100644
index 0000000..e6a3695
--- /dev/null
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/vo/TenantVo.java
@@ -0,0 +1,10 @@
+package org.springblade.system.vo;
+
+import lombok.Data;
+import org.springblade.system.entity.Tenant;
+import java.io.Serializable;
+
+@Data
+public class TenantVo extends Tenant implements Serializable {
+ private Long deptId;
+}
--
Gitblit v1.9.3