Browse Source

Merge branch 'prod-5.1.3' of http://175.6.40.68:8081/Jone/hzims-back into prod-5.1.3

zhongwei
liwen 4 months ago
parent
commit
1891c92b14
  1. 1
      hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareOutServiceFallback.java
  2. 1
      hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java
  3. 1
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java
  4. 1
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseInServiceImpl.java
  5. 1
      hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java
  6. 3
      hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java
  7. 1
      hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java
  8. 1
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/CameraInfoServiceImpl.java
  9. 1
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java
  10. 2
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/CompressUtils.java
  11. 4
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java
  12. 2
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java
  13. 1
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java
  14. 1
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HtmltoPdf.java
  15. 3
      hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java
  16. 3
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/utils/ZXingGenCode.java
  17. 1
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java
  18. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java
  19. 3
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/common/ExcelData.java
  20. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceTaskController.java
  21. 1
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java
  22. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java
  23. 3
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/CommonUtils.java
  24. 2
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ExcelUtil.java
  25. 3
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ZpiUtil.java
  26. 1
      hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/config/XxlJobConfig.java
  27. 9
      hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java
  28. 1
      hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/HtmltoPdf.java
  29. 3
      hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ZXingGenCode.java
  30. 4
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java
  31. 9
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java
  32. 1
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java
  33. 7
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java
  34. 2
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/ExcelUtil.java
  35. 14
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java
  36. 2
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
  37. 1
      hzims-service/weather/src/main/java/com/hnac/hzims/weather/config/XxlJobConfig.java

1
hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareOutServiceFallback.java

@ -12,7 +12,6 @@ public class ISpareOutServiceFallback implements ISpareOutServiceClient {
Long tenantId, Long tenantId,
Integer current, Integer current,
Integer size){ Integer size){
System.out.println("熔断了");
return null; return null;
} }

1
hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java

@ -122,7 +122,6 @@ public class HttpRequestUtil {
result += str; result += str;
} }
log.info(url+"-------------------------{}"+result); log.info(url+"-------------------------{}"+result);
System.out.println(result);
//关闭流 //关闭流
is.close(); is.close();
//断开连接,disconnect是在底层tcp socket链接空闲时才切断,如果正在被其他线程使用就不切断。 //断开连接,disconnect是在底层tcp socket链接空闲时才切断,如果正在被其他线程使用就不切断。

1
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java

@ -86,7 +86,6 @@ public class SpAllocationServiceImpl extends ServiceImpl<SpAllocationMapper, SpA
code = code.concat(dateStr).concat(AssetsNumCache.getCodeNum()); code = code.concat(dateStr).concat(AssetsNumCache.getCodeNum());
entity.setCode(code); entity.setCode(code);
super.save(entity); super.save(entity);
System.out.println(entity.getId());
for (int i = 0; i < basicEntityList.size(); i++) { for (int i = 0; i < basicEntityList.size(); i++) {
if(basicEntityList.get(i).getAmount()<=0){ if(basicEntityList.get(i).getAmount()<=0){
throw new ServiceException("数量必须大于0"); throw new ServiceException("数量必须大于0");

1
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseInServiceImpl.java

@ -78,7 +78,6 @@ public class SpWarehouseInServiceImpl extends ServiceImpl<SpWarehouseInMapper, S
public synchronized boolean save(SpWarehouseInEntity entity) { public synchronized boolean save(SpWarehouseInEntity entity) {
List<SpRecordEntity> basicEntityList = entity.getBasicList(); List<SpRecordEntity> basicEntityList = entity.getBasicList();
super.save(entity); super.save(entity);
System.out.println(entity.getId());
for (int i = 0; i < basicEntityList.size(); i++) { for (int i = 0; i < basicEntityList.size(); i++) {
if(basicEntityList.get(i).getAmount()<=0){ if(basicEntityList.get(i).getAmount()<=0){
throw new ServiceException("数量必须大于0"); throw new ServiceException("数量必须大于0");

1
hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java

@ -493,7 +493,6 @@ public class WtSpBasicServiceImpl extends ServiceImpl<WtSpBasicMapper, WtSpBasic
// .doWrite(list); // .doWrite(list);
// response.getOutputStream().close(); // response.getOutputStream().close();
} catch (Exception e) { } catch (Exception e) {
System.out.println("exportExcel = " + e);
// 重置response // 重置response
response.reset(); response.reset();
response.setContentType("application/json"); response.setContentType("application/json");

3
hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java

@ -423,7 +423,6 @@ public class FdpMonitorServiceImpl extends ServiceImpl<FdpMonitorMapper, FdpMoni
key = taskDTO.getId().toString(); key = taskDTO.getId().toString();
redisTemplate.opsForValue().set(KEY_FOR_FDP_TASK_ID + "_" + key, key); redisTemplate.opsForValue().set(KEY_FOR_FDP_TASK_ID + "_" + key, key);
Boolean expire = redisTemplate.expire(KEY_FOR_FDP_TASK_ID + "_" + key,3, TimeUnit.DAYS); Boolean expire = redisTemplate.expire(KEY_FOR_FDP_TASK_ID + "_" + key,3, TimeUnit.DAYS);
System.out.println(expire);
} }
} else { } else {
//没有未完成的任务,新增一个任务 //没有未完成的任务,新增一个任务
@ -554,7 +553,6 @@ public class FdpMonitorServiceImpl extends ServiceImpl<FdpMonitorMapper, FdpMoni
key = taskDTO.getId().toString(); key = taskDTO.getId().toString();
redisTemplate.opsForValue().set(KEY_FOR_FDP_TASK_ID + "_" + key, key); redisTemplate.opsForValue().set(KEY_FOR_FDP_TASK_ID + "_" + key, key);
Boolean expire = redisTemplate.expire(KEY_FOR_FDP_TASK_ID + "_" + key,3, TimeUnit.DAYS); Boolean expire = redisTemplate.expire(KEY_FOR_FDP_TASK_ID + "_" + key,3, TimeUnit.DAYS);
System.out.println(expire);
} }
} else { } else {
//没有未完成的任务,新增一个任务 //没有未完成的任务,新增一个任务
@ -615,7 +613,6 @@ public class FdpMonitorServiceImpl extends ServiceImpl<FdpMonitorMapper, FdpMoni
diagnoseFaultReq.setLifeTime(24*3);//一旦用户进行修改,智能诊断时效性刷新为3天 diagnoseFaultReq.setLifeTime(24*3);//一旦用户进行修改,智能诊断时效性刷新为3天
faultAllReq.setManualData(diagnoseFaultReq); faultAllReq.setManualData(diagnoseFaultReq);
String jsonString = JSONObject.toJSONString(faultAllReq); String jsonString = JSONObject.toJSONString(faultAllReq);
System.out.println(jsonString);
HttpResponse r = HttpClientUtils.post(updateFaultStateAll, JSONObject.toJSONString(faultAllReq)); HttpResponse r = HttpClientUtils.post(updateFaultStateAll, JSONObject.toJSONString(faultAllReq));
if(StringUtil.isNotBlank(diagnoseFaultReq.getTaskId())) { if(StringUtil.isNotBlank(diagnoseFaultReq.getTaskId())) {
redisTemplate.expire(KEY_FOR_FDP_TASK_ID + "_" + diagnoseFaultReq.getTaskId(), 3, TimeUnit.DAYS); redisTemplate.expire(KEY_FOR_FDP_TASK_ID + "_" + diagnoseFaultReq.getTaskId(), 3, TimeUnit.DAYS);

1
hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java

@ -36,7 +36,6 @@ public class DroolsMqttConsumer implements SubscribeCallBack {
alarmSaveService.save(alarmEntities); alarmSaveService.save(alarmEntities);
}catch (Exception e){ }catch (Exception e){
log.error("规则引擎告警数据处理报错(DroolsAlarm):"+e); log.error("规则引擎告警数据处理报错(DroolsAlarm):"+e);
System.out.println("规则引擎告警数据处理报错(DroolsAlarm):"+e);
} }
} }
} }

1
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/CameraInfoServiceImpl.java

@ -28,7 +28,6 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
public void testSms(){ public void testSms(){
// 发送短信 // 发送短信
R<SmsResponse> success = smsClient.sendMessage("aliyun-task-end", "{\"two\":\"2021-03-24 16:41:26\",\"one\":\"测试短信3\"}", "18229968652"); R<SmsResponse> success = smsClient.sendMessage("aliyun-task-end", "{\"two\":\"2021-03-24 16:41:26\",\"one\":\"测试短信3\"}", "18229968652");
System.out.println("msg -- 用户手机号:18229968652 ; 返回信息 = " + (Func.isNotEmpty(success)?success.toString(): "返回为空"));
} }
@Override @Override

1
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java

@ -44,7 +44,6 @@ public class XxlJobConfig {
xxlJobSpringExecutor.setAppname(appName); xxlJobSpringExecutor.setAppname(appName);
xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setIp(ip);
xxlJobSpringExecutor.setPort(port); xxlJobSpringExecutor.setPort(port);
System.out.println(">>>>>>>>>>> xxl-rpc, port " + port);
xxlJobSpringExecutor.setAccessToken(accessToken); xxlJobSpringExecutor.setAccessToken(accessToken);
xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogPath(logPath);
xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);

2
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/CompressUtils.java

@ -79,7 +79,6 @@ public class CompressUtils {
in.close(); in.close();
} }
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
System.out.println("压缩完成,耗时:" + (end - start) + " ms");
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("zip error from ZipUtils", e); throw new RuntimeException("zip error from ZipUtils", e);
} finally { } finally {
@ -244,7 +243,6 @@ public class CompressUtils {
in.close(); in.close();
} }
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
System.out.println("压缩完成,耗时:" + (end - start) +" ms");
result = true; result = true;
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("zip error from ZipUtils",e); throw new RuntimeException("zip error from ZipUtils",e);

4
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java

@ -75,13 +75,11 @@ public class InspectReportController {
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
List<InspectMonthReportExcel> datas = irs.getExcelByMonth(month, routId, userId); List<InspectMonthReportExcel> datas = irs.getExcelByMonth(month, routId, userId);
if(datas!=null && datas.size()>0){ if(datas!=null && datas.size()>0){
System.out.println("---------------- size = " + datas.size());
// 这里需要设置不关闭流 // 这里需要设置不关闭流
EasyExcel.write(response.getOutputStream(), InspectMonthReportExcel.class).autoCloseStream(Boolean.FALSE).sheet(month +"巡检详情") EasyExcel.write(response.getOutputStream(), InspectMonthReportExcel.class).autoCloseStream(Boolean.FALSE).sheet(month +"巡检详情")
.doWrite(datas); .doWrite(datas);
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("exportExcel = " + e);
// 重置response // 重置response
response.reset(); response.reset();
response.setContentType("application/json"); response.setContentType("application/json");
@ -118,13 +116,11 @@ public class InspectReportController {
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
List<InspectMonthReportExcel> datas = irs.getExcelByMonthGather(vo); List<InspectMonthReportExcel> datas = irs.getExcelByMonthGather(vo);
if(datas!=null && datas.size()>0){ if(datas!=null && datas.size()>0){
System.out.println("---------------- size = " + datas.size());
// 这里需要设置不关闭流 // 这里需要设置不关闭流
EasyExcel.write(response.getOutputStream(), InspectMonthReportExcel.class).autoCloseStream(Boolean.FALSE).sheet(vo.getMonth() +"巡检详情") EasyExcel.write(response.getOutputStream(), InspectMonthReportExcel.class).autoCloseStream(Boolean.FALSE).sheet(vo.getMonth() +"巡检详情")
.doWrite(datas); .doWrite(datas);
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("exportExcel = " + e);
// 重置response // 重置response
response.reset(); response.reset();
response.setContentType("application/json"); response.setContentType("application/json");

2
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java

@ -180,13 +180,11 @@ public class TaskController extends BladeController {
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
List<InspectTaskExportVO> list = taskService.exportTaskList(task); List<InspectTaskExportVO> list = taskService.exportTaskList(task);
if(list!=null && list.size()>0){ if(list!=null && list.size()>0){
System.out.println("---------------- size = " + list.size());
// 这里需要设置不关闭流 // 这里需要设置不关闭流
EasyExcel.write(response.getOutputStream(), InspectTaskExportVO.class).autoCloseStream(Boolean.FALSE).sheet("巡检任务报表") EasyExcel.write(response.getOutputStream(), InspectTaskExportVO.class).autoCloseStream(Boolean.FALSE).sheet("巡检任务报表")
.doWrite(list); .doWrite(list);
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("exportExcel = " + e);
// 重置response // 重置response
response.reset(); response.reset();
response.setContentType("application/json"); response.setContentType("application/json");

1
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java

@ -117,7 +117,6 @@ public class HiKUtil {
put("https://", url); put("https://", url);
}}; }};
final String contentType = "application/json"; final String contentType = "application/json";
System.out.println("海康调用传参"+ JSON.toJSONString(variable));
String result = ArtemisHttpUtil.doPostStringArtemis(path, JSON.toJSONString(variable), null, null, contentType , null); String result = ArtemisHttpUtil.doPostStringArtemis(path, JSON.toJSONString(variable), null, null, contentType , null);
Assert.isTrue("0".equals(JSONObject.parseObject(result).getString("code")),() -> { Assert.isTrue("0".equals(JSONObject.parseObject(result).getString("code")),() -> {
throw new ServiceException("调用海康URL失败,报错信息为:" + result); throw new ServiceException("调用海康URL失败,报错信息为:" + result);

1
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HtmltoPdf.java

@ -128,7 +128,6 @@ public class HtmltoPdf {
public static String getCurrentOperatingSystem(){ public static String getCurrentOperatingSystem(){
String os = System.getProperty("os.name").toLowerCase(); String os = System.getProperty("os.name").toLowerCase();
System.out.println("---------当前操作系统是-----------" + os);
return os; return os;
} }

3
hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java

@ -54,9 +54,6 @@ public class ZxingGenCode {
Result result = null; Result result = null;
try { try {
image = ImageIO.read(new File(imgPath)); image = ImageIO.read(new File(imgPath));
if (image == null) {
System.out.println("the decode image may be not exit.");
}
LuminanceSource source = new BufferedImageLuminanceSource(image); LuminanceSource source = new BufferedImageLuminanceSource(image);
BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));

3
hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/utils/ZXingGenCode.java

@ -47,9 +47,6 @@ public class ZXingGenCode {
Result result = null; Result result = null;
try { try {
image = ImageIO.read(new File(imgPath)); image = ImageIO.read(new File(imgPath));
if (image == null) {
System.out.println("the decode image may be not exit.");
}
LuminanceSource source = new BufferedImageLuminanceSource(image); LuminanceSource source = new BufferedImageLuminanceSource(image);
BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));

1
hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java

@ -133,7 +133,6 @@ public class StAlamRecordServiceImpl extends ServiceImpl<StAlarmRecordMapper, St
Set<String> stationIds = station.stream().map(StationEntity::getCode).collect(Collectors.toSet()); Set<String> stationIds = station.stream().map(StationEntity::getCode).collect(Collectors.toSet());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date2 = new Date(); Date date2 = new Date();
System.out.println("开始:" + sdf.format(date2));
//查询出用户所拥有的数据权限站点下的所有属性 //查询出用户所拥有的数据权限站点下的所有属性
List<StFocusPropertiesEntity> list = stFocusPropertiesService.list(new LambdaQueryWrapper<StFocusPropertiesEntity>() {{ List<StFocusPropertiesEntity> list = stFocusPropertiesService.list(new LambdaQueryWrapper<StFocusPropertiesEntity>() {{
in(StFocusPropertiesEntity::getStationId, stationIds); in(StFocusPropertiesEntity::getStationId, stationIds);

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java

@ -169,7 +169,6 @@ public class ImsAnalyseExampleServiceImpl extends ServiceImpl<ImsAnalyseExampleM
arrayData.addAll(dataBefore); arrayData.addAll(dataBefore);
data.add(arrayData); data.add(arrayData);
} }
System.out.println("---------------- 数据详情 = " + records);
//ExcelWriter初始化 //ExcelWriter初始化
ExcelWriter excelWriter = EasyExcel ExcelWriter excelWriter = EasyExcel
.write(response.getOutputStream()) .write(response.getOutputStream())
@ -185,7 +184,6 @@ public class ImsAnalyseExampleServiceImpl extends ServiceImpl<ImsAnalyseExampleM
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("exportExcel = " + e);
// 重置response // 重置response
response.reset(); response.reset();
response.setContentType("application/json"); response.setContentType("application/json");

3
hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/common/ExcelData.java

@ -55,10 +55,8 @@ public class ExcelData {
String operateSteps=""; String operateSteps="";
//获取行数 //获取行数
int rows = XSSfSheet.getPhysicalNumberOfRows(); int rows = XSSfSheet.getPhysicalNumberOfRows();
System.out.println(rows);
for(int i=0;i<rows;i++){ for(int i=0;i<rows;i++){
XSSFRow row = XSSfSheet.getRow(i); XSSFRow row = XSSfSheet.getRow(i);
System.out.println("行数为:"+i+";列数为:"+currentColumn);
XSSFCell cell = row.getCell(currentColumn); XSSFCell cell = row.getCell(currentColumn);
String cellValue = cell.toString(); String cellValue = cell.toString();
if(cellValue.equals(caseName)){ if(cellValue.equals(caseName)){
@ -79,7 +77,6 @@ public class ExcelData {
int columns = row.getPhysicalNumberOfCells(); int columns = row.getPhysicalNumberOfCells();
for(int j=0;j<columns;j++){ for(int j=0;j<columns;j++){
String cell = row.getCell(j).toString(); String cell = row.getCell(j).toString();
System.out.println(cell);
} }
} }
} }

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/OperMaintenanceTaskController.java

@ -156,13 +156,11 @@ public class OperMaintenanceTaskController extends BladeController {
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
List<MaintenanceExportVO> list = taskService.exportMaintenance(req); List<MaintenanceExportVO> list = taskService.exportMaintenance(req);
if(list!=null && list.size()>0){ if(list!=null && list.size()>0){
System.out.println("---------------- size = " + list.size());
// 这里需要设置不关闭流 // 这里需要设置不关闭流
EasyExcel.write(response.getOutputStream(), MaintenanceExportVO.class).autoCloseStream(Boolean.FALSE).sheet("日常维护记录统计") EasyExcel.write(response.getOutputStream(), MaintenanceExportVO.class).autoCloseStream(Boolean.FALSE).sheet("日常维护记录统计")
.doWrite(list); .doWrite(list);
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("exportExcel = " + e);
// 重置response // 重置response
response.reset(); response.reset();
response.setContentType("application/json"); response.setContentType("application/json");

1
hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java

@ -356,7 +356,6 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor
log.info("电站发电量总览"+reportVOS.toString()); log.info("电站发电量总览"+reportVOS.toString());
}catch (Exception e){ }catch (Exception e){
log.error("getStationMonthReportV2电站发电量报错", e); log.error("getStationMonthReportV2电站发电量报错", e);
System.out.println(e);
}finally { }finally {
countDownLatch.countDown(); countDownLatch.countDown();
log.info("电站发电耗时:"+(System.currentTimeMillis()-startMillis)+"ms"); log.info("电站发电耗时:"+(System.currentTimeMillis()-startMillis)+"ms");

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java

@ -129,10 +129,8 @@ public class ArtemisPostUtils {
String body = jsonBody.toJSONString(); String body = jsonBody.toJSONString();
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType, null); String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType, null);
} catch (InterruptedException e) { } catch (InterruptedException e) {
System.out.println("Runnable is error");
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} }
System.out.println("Runnable running");
} }
}; };
Thread thread = new Thread(myRunnable); Thread thread = new Thread(myRunnable);

3
hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/CommonUtils.java

@ -186,9 +186,6 @@ public class CommonUtils {
cell1.setCellStyle(valStyle); cell1.setCellStyle(valStyle);
Map dataMap = avgList.get(i).getDataMap(); Map dataMap = avgList.get(i).getDataMap();
for (Object o : dataMap.keySet()) {
System.out.println("测试打印:" + o + "===" + dataMap.get(o));
}
//第2格为上月平均值 //第2格为上月平均值
Cell cell2 = row.createCell(2); Cell cell2 = row.createCell(2);
if (dataMap.get(preMonthStr) != null) { if (dataMap.get(preMonthStr) != null) {

2
hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ExcelUtil.java

@ -96,8 +96,6 @@ public class ExcelUtil {
if(resources.length == 1) { if(resources.length == 1) {
InputStream inputStream = resources[0].getInputStream(); InputStream inputStream = resources[0].getInputStream();
inputStreamToFile(inputStream, file); inputStreamToFile(inputStream, file);
}else {
System.out.println("请检查模板文件是否存在");
} }
return file; return file;
} }

3
hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ZpiUtil.java

@ -49,7 +49,6 @@ public class ZpiUtil {
out = new FileOutputStream(file.getPath()); out = new FileOutputStream(file.getPath());
workbook.write(out); workbook.write(out);
} catch (Exception e) { } catch (Exception e) {
System.out.println("出现异常");
e.printStackTrace(); e.printStackTrace();
} }
fileList.add(file); fileList.add(file);
@ -123,7 +122,6 @@ public class ZpiUtil {
zipOut.closeEntry(); zipOut.closeEntry();
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("压缩ZIP包出现异常");
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
in.close(); in.close();
@ -152,7 +150,6 @@ public class ZpiUtil {
} }
response.flushBuffer(); response.flushBuffer();
} catch (IOException e) { } catch (IOException e) {
System.out.println("下载出现异常");
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
fis.close(); fis.close();

1
hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/config/XxlJobConfig.java

@ -45,7 +45,6 @@ public class XxlJobConfig {
xxlJobSpringExecutor.setAppname(appName); xxlJobSpringExecutor.setAppname(appName);
xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setIp(ip);
xxlJobSpringExecutor.setPort(port); xxlJobSpringExecutor.setPort(port);
System.out.println(">>>>>>>>>>> xxl-rpc, port " + port);
xxlJobSpringExecutor.setAccessToken(accessToken); xxlJobSpringExecutor.setAccessToken(accessToken);
xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogPath(logPath);
xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);

9
hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java

@ -43,7 +43,6 @@ public class ExcelConvertPdf {
Sheet sheet = workbook.getSheetAt(0); Sheet sheet = workbook.getSheetAt(0);
int column = sheet.getRow(1).getLastCellNum(); int column = sheet.getRow(1).getLastCellNum();
int row = sheet.getPhysicalNumberOfRows(); int row = sheet.getPhysicalNumberOfRows();
System.out.println(row);
//下面是找出表格中的空行和空列 //下面是找出表格中的空行和空列
List nullCol = new ArrayList<>(); List nullCol = new ArrayList<>();
List nullRow = new ArrayList<>(); List nullRow = new ArrayList<>();
@ -76,7 +75,6 @@ public class ExcelConvertPdf {
PdfPTable table = new PdfPTable(column-sheet.getRow(1).getFirstCellNum()); PdfPTable table = new PdfPTable(column-sheet.getRow(1).getFirstCellNum());
List<CellRangeAddress> ranges = new ArrayList(); List<CellRangeAddress> ranges = new ArrayList();
int sheetMergeCount = sheet.getNumMergedRegions(); int sheetMergeCount = sheet.getNumMergedRegions();
System.out.println("sheetMergeCount"+sheetMergeCount);
for (int i = 0; i < sheetMergeCount; i++) { for (int i = 0; i < sheetMergeCount; i++) {
CellRangeAddress range = sheet.getMergedRegion(i); CellRangeAddress range = sheet.getMergedRegion(i);
ranges.add(range); ranges.add(range);
@ -104,10 +102,6 @@ public class ExcelConvertPdf {
} else { } else {
str = cell.getStringCellValue(); str = cell.getStringCellValue();
} }
System.out.println("i ::"+i + "j::"+j);
System.out.println(str);
for (CellRangeAddress range : ranges) { //合并的单元格判断和处理 for (CellRangeAddress range : ranges) { //合并的单元格判断和处理
if (j >= range.getFirstColumn() && j <= range.getLastColumn() && i >= range.getFirstRow() if (j >= range.getFirstColumn() && j <= range.getLastColumn() && i >= range.getFirstRow()
@ -125,7 +119,6 @@ public class ExcelConvertPdf {
rowNum = range.getLastRow() - range.getFirstRow() + 1; rowNum = range.getLastRow() - range.getFirstRow() + 1;
colNum = range.getLastColumn() - range.getFirstColumn() + 1; colNum = range.getLastColumn() - range.getFirstColumn() + 1;
cell1 = mergeCell(str, font, rowNum, colNum); cell1 = mergeCell(str, font, rowNum, colNum);
System.out.println("合并"+rowNum+"、"+colNum);
table.addCell(cell1); table.addCell(cell1);
flag = false; flag = false;
mergeFlag = ranges.size() > 1; mergeFlag = ranges.size() > 1;
@ -172,4 +165,4 @@ public class ExcelConvertPdf {
cell.setMinimumHeight(25); cell.setMinimumHeight(25);
return cell; return cell;
} }
} }

1
hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/HtmltoPdf.java

@ -111,7 +111,6 @@ public class HtmltoPdf {
public static String getCurrentOperatingSystem(){ public static String getCurrentOperatingSystem(){
String os = System.getProperty("os.name").toLowerCase(); String os = System.getProperty("os.name").toLowerCase();
System.out.println("---------当前操作系统是-----------" + os);
return os; return os;
} }

3
hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ZXingGenCode.java

@ -47,9 +47,6 @@ public class ZXingGenCode {
Result result = null; Result result = null;
try { try {
image = ImageIO.read(new File(imgPath)); image = ImageIO.read(new File(imgPath));
if (image == null) {
System.out.println("the decode image may be not exit.");
}
LuminanceSource source = new BufferedImageLuminanceSource(image); LuminanceSource source = new BufferedImageLuminanceSource(image);
BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));

4
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java

@ -123,13 +123,9 @@ public class OperationTicketController {
businessMessageDTO.setUserIds(userIds); businessMessageDTO.setUserIds(userIds);
businessMessageDTO.setCreateUser(1522897714092781569L); businessMessageDTO.setCreateUser(1522897714092781569L);
System.out.println("businessMessageDTO = " + businessMessageDTO);
R<Boolean> booleanR = messageClient.sendAppAndWsMsgByUsers(businessMessageDTO); R<Boolean> booleanR = messageClient.sendAppAndWsMsgByUsers(businessMessageDTO);
if (!booleanR.isSuccess()) { if (!booleanR.isSuccess()) {
throw new ServiceException("消息推送失败"); throw new ServiceException("消息推送失败");
}else {
System.out.println("推送成功");
} }
} }

9
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java

@ -25,7 +25,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
@ -92,7 +92,7 @@ public class StandardTicketInfoController extends BladeController {
return standardTicketInfoService.detail(id); return standardTicketInfoService.detail(id);
} }
@PostMapping("/queryList") @PostMapping("/queryList")
@ApiOperationSupport(order = 50) @ApiOperationSupport(order = 50)
@ApiOperation(value = "分页") @ApiOperation(value = "分页")
@ -101,7 +101,7 @@ public class StandardTicketInfoController extends BladeController {
return standardTicketInfoService.queryList(req, query); return standardTicketInfoService.queryList(req, query);
} }
@PostMapping("/exportStandardTicket") @PostMapping("/exportStandardTicket")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "操作票导出") @ApiOperation(value = "操作票导出")
@ -123,14 +123,11 @@ public class StandardTicketInfoController extends BladeController {
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
List<StandardTicketExportVO> list = standardTicketInfoService.exportStandardTicket(req); List<StandardTicketExportVO> list = standardTicketInfoService.exportStandardTicket(req);
if(list!=null && list.size()>0){ if(list!=null && list.size()>0){
System.out.println("---------------- size = " + list.size());
// 这里需要设置不关闭流 // 这里需要设置不关闭流
EasyExcel.write(response.getOutputStream(), StandardTicketExportVO.class).autoCloseStream(Boolean.FALSE).sheet("操作票统计报表") EasyExcel.write(response.getOutputStream(), StandardTicketExportVO.class).autoCloseStream(Boolean.FALSE).sheet("操作票统计报表")
.doWrite(list); .doWrite(list);
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("exportExcel = " + e);
// 重置response
response.reset(); response.reset();
response.setContentType("application/json"); response.setContentType("application/json");
response.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8");

1
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java

@ -901,7 +901,6 @@ public class StandardTicketInfoServiceImpl extends ServiceImpl<StandardTicketInf
} }
} catch (Exception e) { } catch (Exception e) {
log.error("转换失败----》" + e + standardTicketInfoEntity.toString()); log.error("转换失败----》" + e + standardTicketInfoEntity.toString());
System.out.println("转换失败----》" + e + standardTicketInfoEntity);
} }
return exportVO; return exportVO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());

7
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@ -152,7 +152,7 @@ public class TicketProcessServiceImpl implements TicketProcessService, StartProc
private final ISysClient sysClient; private final ISysClient sysClient;
/** /**
@ -469,8 +469,6 @@ public class TicketProcessServiceImpl implements TicketProcessService, StartProc
item.setTicketId(workTicketInfo.getId()); item.setTicketId(workTicketInfo.getId());
return item; return item;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
System.out.println("工作票危险点分析及控制措施票 : " + collect);
ticketInfoDangerService.saveBatch(collect); ticketInfoDangerService.saveBatch(collect);
} }
} }
@ -497,9 +495,6 @@ public class TicketProcessServiceImpl implements TicketProcessService, StartProc
String userIds = response.getUserId(); String userIds = response.getUserId();
businessMessageDTO.setUserIds(userIds); businessMessageDTO.setUserIds(userIds);
businessMessageDTO.setCreateUser(workTicketInfo.getCreateUser()); businessMessageDTO.setCreateUser(workTicketInfo.getCreateUser());
System.out.println("======================================================");
System.out.println("businessMessageDTO = " + businessMessageDTO);
System.out.println("======================================================");
R booleanR = messageClient.sendAppAndWsMsgByUsers(businessMessageDTO); R booleanR = messageClient.sendAppAndWsMsgByUsers(businessMessageDTO);
if (!booleanR.isSuccess()) { if (!booleanR.isSuccess()) {
throw new ServiceException("消息推送失败"); throw new ServiceException("消息推送失败");

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/utils/ExcelUtil.java

@ -97,8 +97,6 @@ public class ExcelUtil {
if(resources.length == 1) { if(resources.length == 1) {
InputStream inputStream = resources[0].getInputStream(); InputStream inputStream = resources[0].getInputStream();
inputStreamToFile(inputStream, file); inputStreamToFile(inputStream, file);
}else {
System.out.println("请检查模板文件是否存在");
} }
return file; return file;
} }

14
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java

@ -27,7 +27,7 @@ import com.hnac.hzinfo.log.contants.BusinessType;
import com.hnac.hzinfo.log.contants.Risk; import com.hnac.hzinfo.log.contants.Risk;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
@ -114,7 +114,7 @@ public class WorkTicketInfoController {
/** /**
* 分页 * 分页
*/ */
@PostMapping("/queryList") @PostMapping("/queryList")
@ApiOperationSupport(order = 50) @ApiOperationSupport(order = 50)
@ApiOperation(value = "分页") @ApiOperation(value = "分页")
@ -131,7 +131,7 @@ public class WorkTicketInfoController {
public void exportWorkTicketInfoPdf(@RequestParam Long id, HttpServletResponse response) { public void exportWorkTicketInfoPdf(@RequestParam Long id, HttpServletResponse response) {
workTicketInfoService.exportWorkTicketInfoPdf(id, response); workTicketInfoService.exportWorkTicketInfoPdf(id, response);
} }
@PostMapping("/exportWorkTicket") @PostMapping("/exportWorkTicket")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@ApiOperation(value = "工作票导出") @ApiOperation(value = "工作票导出")
@ -155,13 +155,11 @@ public class WorkTicketInfoController {
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
List<WorkTicketExportVO> list = workTicketInfoService.exportWorkTicket(req); List<WorkTicketExportVO> list = workTicketInfoService.exportWorkTicket(req);
if(list!=null && list.size()>0){ if(list!=null && list.size()>0){
System.out.println("---------------- size = " + list.size());
// 这里需要设置不关闭流 // 这里需要设置不关闭流
EasyExcel.write(response.getOutputStream(), WorkTicketExportVO.class).autoCloseStream(Boolean.FALSE).sheet("工作票统计报表") EasyExcel.write(response.getOutputStream(), WorkTicketExportVO.class).autoCloseStream(Boolean.FALSE).sheet("工作票统计报表")
.doWrite(list); .doWrite(list);
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("exportExcel = " + e);
// 重置response // 重置response
response.reset(); response.reset();
response.setContentType("application/json"); response.setContentType("application/json");
@ -214,7 +212,7 @@ public class WorkTicketInfoController {
return workTicketInfoService.licenseOfflineTicket(req); return workTicketInfoService.licenseOfflineTicket(req);
} }
@GetMapping("/userListByRoleAlias") @GetMapping("/userListByRoleAlias")
@ApiOperationSupport(order = 100) @ApiOperationSupport(order = 100)
@ApiOperation(value = "获取某机构下角色的人员列表") @ApiOperation(value = "获取某机构下角色的人员列表")
@ -258,7 +256,7 @@ public class WorkTicketInfoController {
/** /**
* 获取工作票台账 * 获取工作票台账
*/ */
@GetMapping("/getWorkTicketBill") @GetMapping("/getWorkTicketBill")
@ApiOperation(value = "获取工作票台账") @ApiOperation(value = "获取工作票台账")
public R<List<WorkTicketBillVO>> getWorkTicketBill(String emCode, String startTime, String endTime) { public R<List<WorkTicketBillVO>> getWorkTicketBill(String emCode, String startTime, String endTime) {
@ -272,7 +270,7 @@ public class WorkTicketInfoController {
return R.data(workTicketInfoService.work(Condition.getPage(query),work)); return R.data(workTicketInfoService.work(Condition.getPage(query),work));
} }
@PostMapping("/cancel") @PostMapping("/cancel")
@ApiOperationSupport(order = 50) @ApiOperationSupport(order = 50)
@ApiOperation(value = "线下工作票作废") @ApiOperation(value = "线下工作票作废")

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java

@ -1018,7 +1018,6 @@ public class WorkTicketInfoServiceImpl extends ServiceImpl<WorkTicketInfoMapper,
// System.out.println("获取classGroupMembers ==> " + classGroupMembers); // System.out.println("获取classGroupMembers ==> " + classGroupMembers);
String[] split = classGroupMembers.split(","); String[] split = classGroupMembers.split(",");
for (String classGroupMember : split) { for (String classGroupMember : split) {
System.out.println(classGroupMember);
if (StringUtils.isNoneBlank(classGroupMember)) { if (StringUtils.isNoneBlank(classGroupMember)) {
boolean matches = classGroupMember.matches("[0-9]+"); boolean matches = classGroupMember.matches("[0-9]+");
if (matches) { if (matches) {
@ -1314,7 +1313,6 @@ public class WorkTicketInfoServiceImpl extends ServiceImpl<WorkTicketInfoMapper,
} }
return resEntity; return resEntity;
} catch (Exception e) { } catch (Exception e) {
System.out.println(e);
log.error("数据转换失败,参数:"+workTicketInfoVO+"报错信息:"+e); log.error("数据转换失败,参数:"+workTicketInfoVO+"报错信息:"+e);
return new WorkTicketExportVO(); return new WorkTicketExportVO();
} }

1
hzims-service/weather/src/main/java/com/hnac/hzims/weather/config/XxlJobConfig.java

@ -45,7 +45,6 @@ public class XxlJobConfig {
xxlJobSpringExecutor.setAppname(appName); xxlJobSpringExecutor.setAppname(appName);
xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setIp(ip);
xxlJobSpringExecutor.setPort(port); xxlJobSpringExecutor.setPort(port);
System.out.println(">>>>>>>>>>> xxl-rpc, port " + port);
xxlJobSpringExecutor.setAccessToken(accessToken); xxlJobSpringExecutor.setAccessToken(accessToken);
xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogPath(logPath);
xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);

Loading…
Cancel
Save