24b77381 康伟

kangwei:药剂结算对接

1 个父辈 2f319ed0
......@@ -87,7 +87,7 @@ public class SuddenDescentAlarmJob implements Job {
private ISysDepartService sysDepartService;
@Autowired
private IAlarmRuleConfigPublicTabService alarmRuleConfigPublicTabService;
@Autowired
private IFlowService flowService;
@Autowired
......@@ -118,7 +118,7 @@ public class SuddenDescentAlarmJob implements Job {
alarmRuleConfigPublicTabList.forEach(v->{
alarmTypeDictMap.put(v.getId(), v);
});
//获取要报警指标
QueryWrapper<AlarmCustomRuleConfig> alarmCustomRuleConfigQueryWrapper = new QueryWrapper<>();
alarmCustomRuleConfigQueryWrapper.eq("alarm_rule_repository_id","1693925002376962050");
......@@ -136,9 +136,9 @@ public class SuddenDescentAlarmJob implements Job {
String alarmRuleId = alarmCustomRuleConfig.getId();
String alarmRuleType = alarmCustomRuleConfig.getAlarmRuleType();
String alarmRecommend = alarmCustomRuleConfig.getAlarmRecommend();
String alarmRuleRepositoryTreepath = alarmCustomRuleConfig.getAlarmRuleRepositoryTreepath();
//获取报警规则id对应的报警级别
QueryWrapper<AlarmRuleLevelConfig> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alarm_rule_id", alarmRuleId);
......@@ -162,7 +162,7 @@ public class SuddenDescentAlarmJob implements Job {
//String endTime = DateUtils.formatDate(endDate,"yyyy-MM-dd HH:mm:ss");
String startTime = String.valueOf(startDate.getTime()/1000);
String endTime = String.valueOf(endDate.getTime()/1000);
for (String monitorDictCode : monitorDictCodeList) {
String msg = "";
AlarmRuleConfigAndLevelVO alarmRuleConfigAndLevelVO = new AlarmRuleConfigAndLevelVO();
......@@ -224,7 +224,7 @@ public class SuddenDescentAlarmJob implements Job {
//alarmRuleConfigAndLevelVO.setAlarmCustomRuleSecondType(treeArray[1]);
alarmRuleConfigAndLevelVO.setAlarmCustomRuleType(treeArray[treeArray.length-1]);
alarmRuleConfigAndLevelVO.setAlarmCustomRuleTypeTreepath(alarmRuleRepositoryTreepath);
excessList.add(alarmRuleConfigAndLevelVO);
}
}
......@@ -245,7 +245,7 @@ public class SuddenDescentAlarmJob implements Job {
/**
* 判断是否需要发送短信和通知
*
* @param resultList
* @param
*/
public void sendMessage(List<AlarmRuleConfigAndLevelVO> excessList) {
//超标报警
......@@ -271,7 +271,7 @@ public class SuddenDescentAlarmJob implements Job {
String alarmRuleLevelConfigId = alarmRuleLevelConfig.getId();
String content = alarmRuleAndAlarmRuleLevelVO.getAlarmMsg();
String departName = departNameTemplete.replace("${departName}", alarmRuleAndAlarmRuleLevelVO.getDepartName());
//查询短信上一条报警是否处理,未处理就不新增报警记录
//TODO 先从数据库中获取,后期优化放redis中
QueryWrapper<AlarmRecordHistory> queryWrapper = new QueryWrapper<>();
......@@ -326,7 +326,7 @@ public class SuddenDescentAlarmJob implements Job {
//流程添加定义ID
String processDefinitionId = flowBusinessService.getProcessDefinitionLastVersionId("productAlarmProcess");
alarmRecordHistory.setProcessDefinitionId(processDefinitionId);
//添加报警类型相关数据
alarmRecordHistory.setAlarmRuleType(alarmRuleType);
alarmRecordHistory.setAlarmRuleTopType(alarmRuleAndAlarmRuleLevelVO.getAlarmRuleTopType());
......@@ -338,7 +338,7 @@ public class SuddenDescentAlarmJob implements Job {
alarmRecordHistory.setAlarmCustomRuleSecondType(alarmRuleAndAlarmRuleLevelVO.getAlarmCustomRuleSecondType());
alarmRecordHistory.setAlarmCustomRuleType(alarmRuleAndAlarmRuleLevelVO.getAlarmCustomRuleType());
alarmRecordHistory.setAlarmCustomRuleTypeTreepath(alarmRuleAndAlarmRuleLevelVO.getAlarmCustomRuleTypeTreepath());
alarmRecordHistoryService.save(alarmRecordHistory);
......@@ -455,7 +455,7 @@ public class SuddenDescentAlarmJob implements Job {
return false;
}
}
/**
* @param businessTable
* @param flowKey
......
......@@ -206,11 +206,10 @@ public class ErpSettlementController {
}
@AutoLog(value = "药剂结算单详情-验收审批")
@ApiOperation(value="药剂结算单详情-验收审批", notes="药剂结算单详情-验收审批")
@DeleteMapping(value = "/auditAccept")
@GetMapping(value = "/auditAccept")
public Result<?> auditAccept(@RequestParam(name="id",required=true) String id) {
Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
erpSettlementEntity.setInspectTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
erpSettlementEntity.setInspectorSign(BaseContextHandler.getUserName());
if(erpSettlementEntity==null) {
......@@ -226,11 +225,10 @@ public class ErpSettlementController {
@AutoLog(value = "药剂结算单详情-经理审批")
@ApiOperation(value="药剂结算单详情-经理审批", notes="药剂结算单详情-经理审批")
@DeleteMapping(value = "/auditManager")
@GetMapping(value = "/auditManager")
public Result<?> auditManager(@RequestParam(name="id",required=true) String id) {
Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
erpSettlementEntity.setApproveTime(DateUtils.format(new Date(), HolidaysUtils.DATE_TIME_PATTERN));
erpSettlementEntity.setApproverSign(BaseContextHandler.getUserName());
if(erpSettlementEntity==null) {
......@@ -245,7 +243,7 @@ public class ErpSettlementController {
}
@AutoLog(value = "药剂结算单详情-结算")
@ApiOperation(value="药剂结算单详情-结算", notes="药剂结算单详情-结算")
@DeleteMapping(value = "/settlement")
@GetMapping(value = "/settlement")
public Result<?> settlement(@RequestParam(name="id",required=true) String id) {
Result<ErpSettlementVO> result = new Result<ErpSettlementVO>();
ErpSettlement erpSettlementEntity = erpSettlementService.getById(id);
......@@ -255,7 +253,6 @@ public class ErpSettlementController {
result.error500("未找到对应实体");
}else {
//修改 入库表状态
boolean ok = erpSettlementService.settlement(erpSettlementEntity);
if(ok) {
result.success("结算成功!");
......
......@@ -40,6 +40,7 @@ public class ErpSettlement {
/**水厂编号*/
@Excel(name = "水厂编号", width = 15)
@ApiModelProperty(value = "水厂编号")
@Dict(dictTable="sys_depart",dicCode = "id",dicText = "depart_name")
private String departId;
/**采购合同*/
@ApiModelProperty(value = "采购合同")
......
......@@ -175,7 +175,7 @@ skua:
appKey: 3a2653ad36727
pushHostName: http://api.push.mob.com/v3/push/createPush
packageName: com.kingtrol.flutter_zhongye
iosProduction: 0
iosProduction: 1
# 自定义逻辑,以','分割(e.g: messagePush:消息推送完后处理)
flow:
custom-logic: messagePush
......
......@@ -18,26 +18,19 @@ import java.util.List;
public class JnhbLargeScreenVO {
@ApiModelProperty(value = "头部统计数值")
private List<ResultNumberVO> headStatisticsList = null;
@ApiModelProperty(value = "各站点能源消耗排名")
private List<PowerConsumeVO> powerConsumeVOList = null;
@ApiModelProperty(value = "负荷率对象")
private List<LoadRateVO> loadRateVOList = null;
@ApiModelProperty(value = "CO2排放排名")
private List<ResultNumberVO> co2DataList = null;
@ApiModelProperty(value = "消减量统计")
private List<ResultNumberVO> reduceStatisticsList = null;
@ApiModelProperty(value = "ESG减排趋势")
private List<ResultChartsVO> esgChartsList= null;
@ApiModelProperty(value = "吨消减能耗")
private List<ResultChartsVO> energyConsumeChartsList = null;
@ApiModelProperty(value = "废物处理对象集合")
private List<WasteMaterialVO> wasteMaterialList = null;//废物处理对象集合
@ApiModelProperty(value = "一级能耗设备数量")
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!