Skip to content

A
amos-boot-biz
Commit 7adf00a6 authored by caotao's avatar caotao
Browse files
Options

修改定时任务不生效

parent 59520582
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 66 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
View file @ 7adf00a6
......@@ -157,6 +157,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
private Boolean syncSwitch;
@Autowired
@Lazy
private IWlCarMileageService iWlCarMileageService;
/**
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ 7adf00a6
......@@ -161,6 +161,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
private String equipTypeAndCount;
@Autowired
@Lazy
IWlCarMileageService iWlCarMileageService;
@Override
......@@ -176,7 +177,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override
public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction,
String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize, String controBoxBuildId,String companyId, String nameOrCode) {
String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize, String controBoxBuildId, String companyId, String nameOrCode) {
Map<String, Object> map = equipmentManageService.queryEquipmenInfoAndCount(equimentName, equimentCode,
construction, maintenance, bizOrgCode, formGroupId, current, pageSize, controBoxBuildId, companyId, nameOrCode);
List<EquipmentManageVo> dataList = (List<EquipmentManageVo>) map.get("dataList");
......@@ -425,7 +426,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
// responses.add(p);
// });
// List<PointTreeVo> regionList = responses.stream().filter(r -> "TRUE".equals(r.getIsRegion())).collect(Collectors.toList());
if("dl".equals(type)){
if ("dl".equals(type)) {
FeignClientResult<List<OrgUsrDto>> feignClientResult = jcsFeignClient.getCompanyDeptListWithAuth(authKey, "COMPANY", "dl");
orgCode = feignClientResult.getResult().get(0).getBizOrgCode();
}
......@@ -1008,7 +1009,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
map.put("status", list1);
resList.add(map);
i++;
};
}
;
}
return resList;
}
......@@ -1033,7 +1035,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
map.put("realtimeValue", String.valueOf(m.get("realtimeValue")));
resList.add(map);
i++;
};
}
;
}
return resList;
}
......@@ -1443,6 +1446,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
public Map<String, Object> statisticsByStation(String bizOrgCode) {
return fireFightingSystemMapper.statisticsByStation(bizOrgCode);
}
@Override
public Map<String, Object> todayAlarmEquipment(String bizOrgCode) {
Map<String, Object> map = fireFightingSystemMapper.todayAlarmEquipment(bizOrgCode);
......@@ -1503,6 +1507,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
public Page<Map<String, Object>> equipList(Page page, String bizOrgCode) {
return fireFightingSystemMapper.equipList(page, bizOrgCode);
}
@Override
public BigScreenVo getSystemAlarmInfoNum(String companyCode) {
BigScreenVo bigScreenVo = new BigScreenVo();
......@@ -1567,13 +1572,13 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
ArrayList<Map<String, Object>> systemList = new ArrayList<>();
if (!CollectionUtils.isEmpty(system)) {
// 换流站信息
if (!ObjectUtils.isEmpty(system.get(0).get("stationName"))){
if (!ObjectUtils.isEmpty(system.get(0).get("stationName"))) {
map.put("station", system.get(0).get("stationName"));
}else {
} else {
map.put("station", "");
}
map.put("time", startDate.substring(0,7));
map.put("time", startDate.substring(0, 7));
// 单个系统数据
for (Map<String, Object> sys : system) {
HashMap<String, Object> systemData = new HashMap<>();
......@@ -1679,7 +1684,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
}
}else {
} else {
return null;
}
......@@ -1701,8 +1706,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override
public String iotMonthReport(String bizOrgCode, String startDate, String endDate) {
Map<String, Object> DataMap = getData(bizOrgCode, startDate, endDate);
if (DataMap == null){
return null ;
if (DataMap == null) {
return null;
}
WordTemplateUtils instance = WordTemplateUtils.getInstance();
String pdfUrlString = "";
......@@ -1735,7 +1740,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
uploadFile.setUrl(pdfUrlString);
uploadFile.setFileType("image");
uploadFile.setObjectType("m-report");
long time = DateUtils.longStr2Date(startDate+" 00:00:00").getTime();
long time = DateUtils.longStr2Date(startDate + " 00:00:00").getTime();
uploadFile.setObjectId(time);
uploadFile.setName("换流站月总结分析报告");
uploadFile.setDepartmentOrgcode(bizOrgCode);
......@@ -1842,17 +1847,17 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
// } else {
// systemData.put("summarize", "");
// }
systemData.put("summarize", ObjectUtils.isEmpty(summarize.get("name"))?0:summarize.get("name")
+"设备总数"+(ObjectUtils.isEmpty(summarize.get("equipNum"))?0:summarize.get("equipNum"))
+"台，正常设备"+(ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"))
+"台，正常率"+(ObjectUtils.isEmpty(summarize.get("normalRate"))?0:summarize.get("normalRate"))
+"%，故障设备"+(ObjectUtils.isEmpty(summarize.get("faultNum"))?0:summarize.get("faultNum"))
+"台，故障率为"+(ObjectUtils.isEmpty(summarize.get("faultRate"))?0:summarize.get("faultRate"))
+"%，七日告警设备为"+(ObjectUtils.isEmpty(summarize.get("exepctionNum"))?0:summarize.get("exepctionNum"))
+"台，同比上周"+(ObjectUtils.isEmpty(summarize.get("status1"))?"增加":summarize.get("status1"))+(ObjectUtils.isEmpty(summarize.get("exepctionWOW"))?0:summarize.get("exepctionWOW"))
+"%，七日告警总数为"+(ObjectUtils.isEmpty(summarize.get("alarmNum"))?0:summarize.get("alarmNum"))
+"条，同比上周"+(ObjectUtils.isEmpty(summarize.get("status2"))?"增加":summarize.get("status2"))+(ObjectUtils.isEmpty(summarize.get("alarmWOW"))?0:summarize.get("alarmWOW"))
+"%。"
systemData.put("summarize", ObjectUtils.isEmpty(summarize.get("name")) ? 0 : summarize.get("name")
+ "设备总数" + (ObjectUtils.isEmpty(summarize.get("equipNum")) ? 0 : summarize.get("equipNum"))
+ "台，正常设备" + (ObjectUtils.isEmpty(summarize.get("normalNum")) ? 0 : summarize.get("normalNum"))
+ "台，正常率" + (ObjectUtils.isEmpty(summarize.get("normalRate")) ? 0 : summarize.get("normalRate"))
+ "%，故障设备" + (ObjectUtils.isEmpty(summarize.get("faultNum")) ? 0 : summarize.get("faultNum"))
+ "台，故障率为" + (ObjectUtils.isEmpty(summarize.get("faultRate")) ? 0 : summarize.get("faultRate"))
+ "%，七日告警设备为" + (ObjectUtils.isEmpty(summarize.get("exepctionNum")) ? 0 : summarize.get("exepctionNum"))
+ "台，同比上周" + (ObjectUtils.isEmpty(summarize.get("status1")) ? "增加" : summarize.get("status1")) + (ObjectUtils.isEmpty(summarize.get("exepctionWOW")) ? 0 : summarize.get("exepctionWOW"))
+ "%，七日告警总数为" + (ObjectUtils.isEmpty(summarize.get("alarmNum")) ? 0 : summarize.get("alarmNum"))
+ "条，同比上周" + (ObjectUtils.isEmpty(summarize.get("status2")) ? "增加" : summarize.get("status2")) + (ObjectUtils.isEmpty(summarize.get("alarmWOW")) ? 0 : summarize.get("alarmWOW"))
+ "%。"
);
......@@ -1861,16 +1866,16 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
ArrayList<Map<String, Object>> mapList = new ArrayList<>();
HashMap<String, Object> dayEchartsDate = new HashMap<>();
dayEchartsDate.put("type","正常设备");
dayEchartsDate.put("value",ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"));
dayEchartsDate.put("type", "正常设备");
dayEchartsDate.put("value", ObjectUtils.isEmpty(summarize.get("normalNum")) ? 0 : summarize.get("normalNum"));
mapList.add(dayEchartsDate);
HashMap<String, Object> dayEchartsDate1 = new HashMap<>();
dayEchartsDate1.put("type","异常设备");
if (!ObjectUtils.isEmpty(summarize.get("equipNum")) || !ObjectUtils.isEmpty(summarize.get("normalNum"))){
dayEchartsDate1.put("value",Integer.parseInt(String.valueOf(summarize.get("equipNum")))
-Integer.parseInt(String.valueOf(summarize.get("normalNum"))));
}else {
dayEchartsDate1.put("value",0);
dayEchartsDate1.put("type", "异常设备");
if (!ObjectUtils.isEmpty(summarize.get("equipNum")) || !ObjectUtils.isEmpty(summarize.get("normalNum"))) {
dayEchartsDate1.put("value", Integer.parseInt(String.valueOf(summarize.get("equipNum")))
- Integer.parseInt(String.valueOf(summarize.get("normalNum"))));
} else {
dayEchartsDate1.put("value", 0);
}
mapList.add(dayEchartsDate1);
String pieChart1 = ChartsUtils.pieChart(mapList, "告警设备占比");
......@@ -1891,7 +1896,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
}
}else {
} else {
return null;
}
......@@ -1935,7 +1940,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
uploadFile.setUrl(pdfUrlString);
uploadFile.setFileType("image");
uploadFile.setObjectType("w-report");
long time = DateUtils.longStr2Date(startDate+" 00:00:00").getTime();
long time = DateUtils.longStr2Date(startDate + " 00:00:00").getTime();
uploadFile.setObjectId(time);
uploadFile.setName("换流站周总结分析报告");
uploadFile.setDepartmentOrgcode(bizOrgCode);
......@@ -2012,13 +2017,13 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
} else {
listItem.put("trueNum", String.valueOf(0));
}
if (!ObjectUtils.isEmpty(weekItem.get("type_code")) && String.valueOf(weekItem.get("type_code")).endsWith("Fault")){
if (!ObjectUtils.isEmpty(binMap) && !ObjectUtils.isEmpty(listItem.get("name")) && binMap.containsKey(String.valueOf(listItem.get("name")))){
if (!ObjectUtils.isEmpty(weekItem.get("type_code")) && String.valueOf(weekItem.get("type_code")).endsWith("Fault")) {
if (!ObjectUtils.isEmpty(binMap) && !ObjectUtils.isEmpty(listItem.get("name")) && binMap.containsKey(String.valueOf(listItem.get("name")))) {
int newValue = Integer.parseInt(String.valueOf(listItem.get("alarmEquipNum")));
int oldValue = Integer.parseInt(String.valueOf(binMap.get(String.valueOf(listItem.get("name")))));
binMap.put(String.valueOf(listItem.get("name")),newValue + oldValue);
}else {
binMap.put(String.valueOf(listItem.get("name")),listItem.get("alarmEquipNum"));
binMap.put(String.valueOf(listItem.get("name")), newValue + oldValue);
} else {
binMap.put(String.valueOf(listItem.get("name")), listItem.get("alarmEquipNum"));
}
}
......@@ -2053,9 +2058,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
// } else {
// systemData.put("summarize", "");
// }
systemData.put("summarize", ObjectUtils.isEmpty(summarize.get("name"))?0:summarize.get("name")+"设备总数"+(ObjectUtils.isEmpty(summarize.get("equipNum"))?0:summarize.get("equipNum"))
+"台，今日告警设备为"+(ObjectUtils.isEmpty(summarize.get("dayNum"))?0:summarize.get("dayNum"))+"台，告警总数为"+(ObjectUtils.isEmpty(summarize.get("alarmNum"))?0:summarize.get("alarmNum"))+
"条，正常设备"+(ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"))+"台，正常率"+(ObjectUtils.isEmpty(summarize.get("normalRate"))?0:summarize.get("normalRate"))+"%");
systemData.put("summarize", ObjectUtils.isEmpty(summarize.get("name")) ? 0 : summarize.get("name") + "设备总数" + (ObjectUtils.isEmpty(summarize.get("equipNum")) ? 0 : summarize.get("equipNum"))
+ "台，今日告警设备为" + (ObjectUtils.isEmpty(summarize.get("dayNum")) ? 0 : summarize.get("dayNum")) + "台，告警总数为" + (ObjectUtils.isEmpty(summarize.get("alarmNum")) ? 0 : summarize.get("alarmNum")) +
"条，正常设备" + (ObjectUtils.isEmpty(summarize.get("normalNum")) ? 0 : summarize.get("normalNum")) + "台，正常率" + (ObjectUtils.isEmpty(summarize.get("normalRate")) ? 0 : summarize.get("normalRate")) + "%");
// echarts 图表
List<Map<String, Object>> mapList = fireFightingSystemMapper.selectDayEquipEchart(valueOf(system.get("code")), startDate, endDate);
......@@ -2064,16 +2069,16 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
// List<Map<String, Object>> dayEcharts = fireFightingSystemMapper.selectDayEchart(valueOf(system.get("id")), startDate, indicatorList);
ArrayList<Map<String, Object>> dayEchart = new ArrayList<>();
HashMap<String, Object> dayEchartsDate = new HashMap<>();
dayEchartsDate.put("type","正常设备");
dayEchartsDate.put("value",ObjectUtils.isEmpty(summarize.get("normalNum"))?0:summarize.get("normalNum"));
dayEchartsDate.put("type", "正常设备");
dayEchartsDate.put("value", ObjectUtils.isEmpty(summarize.get("normalNum")) ? 0 : summarize.get("normalNum"));
dayEchart.add(dayEchartsDate);
HashMap<String, Object> dayEchartsDate1 = new HashMap<>();
dayEchartsDate1.put("type","异常设备");
if (!ObjectUtils.isEmpty(summarize.get("equipNum")) || !ObjectUtils.isEmpty(summarize.get("normalNum"))){
dayEchartsDate1.put("value",Integer.parseInt(String.valueOf(summarize.get("equipNum")))
-Integer.parseInt(String.valueOf(summarize.get("normalNum"))));
}else {
dayEchartsDate1.put("value",0);
dayEchartsDate1.put("type", "异常设备");
if (!ObjectUtils.isEmpty(summarize.get("equipNum")) || !ObjectUtils.isEmpty(summarize.get("normalNum"))) {
dayEchartsDate1.put("value", Integer.parseInt(String.valueOf(summarize.get("equipNum")))
- Integer.parseInt(String.valueOf(summarize.get("normalNum"))));
} else {
dayEchartsDate1.put("value", 0);
}
dayEchart.add(dayEchartsDate1);
......@@ -2089,8 +2094,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
}
}else {
return null ;
} else {
return null;
}
......@@ -2100,7 +2105,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override
public String iotDayReport(String bizOrgCode, String startDate, String endDate) {
Map<String, Object> dataMap = getDayData(bizOrgCode, startDate, endDate);
if (dataMap == null){
if (dataMap == null) {
return null;
}
WordTemplateUtils instance = WordTemplateUtils.getInstance();
......@@ -2133,7 +2138,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
uploadFile.setUrl(pdfUrlString);
uploadFile.setFileType("image");
uploadFile.setObjectType("d-report");
long time = DateUtils.longStr2Date(startDate+" 00:00:00").getTime();
long time = DateUtils.longStr2Date(startDate + " 00:00:00").getTime();
// DateUtils.getCurrentDayStartTime(new Date()).getTime();
uploadFile.setObjectId(time);
uploadFile.setName("换流站日总结分析报告");
......@@ -2269,8 +2274,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
}
@Override
public Map<String,Object> getSystemDetailByCode(String systemCode) {
Map<String,Object> map = new HashMap<>();
public Map<String, Object> getSystemDetailByCode(String systemCode) {
Map<String, Object> map = new HashMap<>();
LambdaQueryWrapper<FireFightingSystemEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(FireFightingSystemEntity::getCode, systemCode);
List<FireFightingSystemEntity> systemEntities = this.list(wrapper);
......@@ -2286,27 +2291,27 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
} else {
map.put("systemStatus", true);
}
map.put("name",systemEntities.get(0).getName());
map.put("code",systemEntities.get(0).getCode());
map.put("installDate",systemEntities.get(0).getInstallDate());
map.put("chargePersonPhone",systemEntities.get(0).getChargePersonPhone());
map.put("chargePersonName",systemEntities.get(0).getChargePersonName());
map.put("designOrg",systemEntities.get(0).getDesignOrg());
map.put("designOrgTelephone",systemEntities.get(0).getDesignOrgTelephone());
map.put("leadDesigner",systemEntities.get(0).getLeadDesigner());
map.put("name", systemEntities.get(0).getName());
map.put("code", systemEntities.get(0).getCode());
map.put("installDate", systemEntities.get(0).getInstallDate());
map.put("chargePersonPhone", systemEntities.get(0).getChargePersonPhone());
map.put("chargePersonName", systemEntities.get(0).getChargePersonName());
map.put("designOrg", systemEntities.get(0).getDesignOrg());
map.put("designOrgTelephone", systemEntities.get(0).getDesignOrgTelephone());
map.put("leadDesigner", systemEntities.get(0).getLeadDesigner());
Long num = this.baseMapper.selectEquipCountBySystemId(systemEntities.get(0).getId());
String systemType = this.baseMapper.selectEquipSystemType(systemCode);
map.put("systemType",systemType);
map.put("num",num);
map.put("systemType", systemType);
map.put("num", num);
return map;
}
public static List<OrgMenuDto> systemAndEquipmentTree(List<Map<String,Object>> list) {
public static List<OrgMenuDto> systemAndEquipmentTree(List<Map<String, Object>> list) {
List<OrgMenuDto> menuList = list.stream()
.map(o -> new OrgMenuDto(Long.parseLong(o.get("id").toString()), o.get("name").toString(),
ObjectUtils.isEmpty(o.get("parentId")) ? 0L : Long.parseLong(o.get("parentId").toString()),
ObjectUtils.isEmpty(o.get("code")) ? "": o.get("code").toString(),
ObjectUtils.isEmpty(o.get("code")) ? "" : o.get("code").toString(),
false, o.get("bizOrgCode").toString()))
.collect(Collectors.toList());
List<OrgMenuDto> result = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment