Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
4204d028 由 康伟
选项

Merge remote-tracking branch 'origin/master'

2 个父辈 e062bec7 2fecda74
全部展开
内嵌 并排
正在显示 33 个修改的文件 包含 683 行增加 和 183 行删除
sk-base-common/src/main/java/com/skua/common/constant/ReportConstant.java 0 → 100644
package com.skua.common.constant;
/**
* 报表缓存常量
*/
public interface ReportConstant {
//水质水量报表
public static final String view2119 = "2119ecbf53a1d2d0708258ff67cfd9e1";
public static final String view3a24 = "3a243d5715b9e1a3753c180872ca0df9";
public static final String view4411 = "4411ed3d78634bcdcd700f6e33724025";
//化验日报
public static final String view9bff = "9bffaf9187093d6e6a4390e8c56acca8";
}
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingController.java
......@@ -76,11 +76,6 @@ public class AjhMeetingController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<AjhMeeting>> result = new Result<IPage<AjhMeeting>>();
// if(ajhMeeting.getStartTime()!=null&&ajhMeeting.getEndTime()!=null){
// String startTime = ajhMeeting.getStartTime()+" 00:00:00";
// String endTime = ajhMeeting.getEndTime()+" 23:59:59";
// queryWrapper.between("start_time", startTime, endTime);
// }
Page<AjhMeeting> page = new Page<AjhMeeting>(pageNo, pageSize);
IPage<AjhMeeting> pageList = ajhMeetingService.queryPageList(page, ajhMeeting);
result.setSuccess(true);
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingSendController.java
......@@ -99,10 +99,9 @@ public class AjhMeetingSendController {
queryWrapper.like(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetTitle()),"meet_title",ajhMeetingSend.getMeetTitle());
queryWrapper.between(ConvertUtils.isNotEmpty(ajhMeetingSend.getMeetStartTime()),"meet_start_time",
ajhMeetingSend.getMeetStartTime()+" 00:00:00",ajhMeetingSend.getMeetEndTime()+" 23:59:59");
queryWrapper.orderByDesc("send_status");
Page<AjhMeetingSend> page = new Page<AjhMeetingSend>(pageNo, pageSize);
IPage<AjhMeetingSend> pageList = ajhMeetingSendService.queryPage(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/AjhRectificationInfoMapper.java
......@@ -87,7 +87,8 @@ public interface AjhRectificationInfoMapper extends BaseMapper<AjhRectificationI
* @param endDate
* @return
*/
List<RectificationInfoAnalyseVO.XAndCount> areaList(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
List<RectificationInfoAnalyseVO.XAndCount> areaList(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate,
@Param("departId") String departId);
/**
* 雷达图：安全隐患伤害类别
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhMeetingMapper.xml
......@@ -46,7 +46,7 @@
<if test="ajhMeeting.meetCategory !=null and ajhMeeting.meetCategory!=''">
AND m.meet_category = #{ajhMeeting.meetCategory}
</if>
order by m.create_time desc
order by m.create_time desc,m.send_status asc
</select>
<select id="getDataById" resultType="com.skua.modules.ajh.vo.AjhMeetingVO">
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhRectificationInfoMapper.xml
......@@ -162,17 +162,26 @@
) t
group by ym;
</select>
<select id="areaList" resultType="com.skua.modules.ajh.vo.RectificationInfoAnalyseVO$XAndCount">
<!--要求：要返回所有的字典项-->
select dic.struct_name x, count
from (
select ri.rec_ord_body,count(*) count
from ajh_rectification_info ri
where rec_ord_report_date between #{startDate} and #{endDate}
where rec_ord_report_date between #{startDate} and #{endDate}
group by ri.rec_ord_body
) t
right join sys_struct_dict dic on t.rec_ord_body = dic.id
where 1=1
<if test="departId!=null and departId!=''">
and dic.depart_id in
<foreach item="item" index="index" collection="departId.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="classifyList" resultType="java.lang.String">
select GROUP_CONCAT(rec_ord_classify)
from ajh_rectification_info ri
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/impl/AjhRectificationInfoServiceImpl.java
......@@ -255,7 +255,7 @@ public class AjhRectificationInfoServiceImpl extends ServiceImpl<AjhRectificatio
vo.setLevelHistogramList(mapper.levelHistogramList(startDate, endDate, departId));
vo.setDutyHistogramList(mapper.dutyHistogramList(startDate, endDate, departId));
vo.setAreaList(mapper.areaList(startDate, endDate));
vo.setAreaList(mapper.areaList(startDate, endDate, departId));
//雷达图：安全隐患伤害类别 (因为一个安全隐患可以选择多个[伤害类别]，所以统计会复杂些)-------------------------------------------------------------------------------------------
List<RectificationInfoAnalyseVO.XAndCount> classifyList = new LinkedList<>();
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/service/impl/CommandCentreServiceImpl.java
package com.skua.modules.algorithm.service.impl;
import com.skua.common.constant.ReportConstant;
import com.skua.common.report.ReportViewUtil;
import com.skua.core.context.SpringContextUtils;
import com.skua.core.util.ConvertUtils;
......@@ -41,8 +42,6 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
@Resource
private FReportItemMapper reportItemMapper;
String view2119 = "2119ecbf53a1d2d0708258ff67cfd9e1";// 水 COD TP TN NH3H
String view3a24 = "3a243d5715b9e1a3753c180872ca0df9";//能耗报表
/**
* 指挥中心---运行负荷率分析
* @param reportItemvParam
......@@ -135,16 +134,14 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
public DepartDrugResult getYhTotal(String month) {
String monthTb = DateUtils.getTbMonth(month);//同比时间
String monthHb = DateUtils.getHbMonth(month);//环比时间
String view2119 = "2119ecbf53a1d2d0708258ff67cfd9e1";
String view3a24 = "3a243d5715b9e1a3753c180872ca0df9";
String dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", "", month);
String dataViewName2119tb = ReportViewUtil.buildViewLike(view2119,"CSL", "", monthTb);
String dataViewName2119hb = ReportViewUtil.buildViewLike(view2119,"CSL", "", monthHb);
String dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", "", month);
String dataViewName2119tb = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", "", monthTb);
String dataViewName2119hb = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", "", monthHb);
String field3a24 = "PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ," +
"YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
String dataViewName3a24 = ReportViewUtil.buildViewLike(view3a24,field3a24, "", month);
String dataViewName3a24tb = ReportViewUtil.buildViewLike(view3a24,field3a24, "", monthTb);
String dataViewName3a24hb = ReportViewUtil.buildViewLike(view3a24,field3a24, "", monthHb);
String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, "", month);
String dataViewName3a24tb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, "", monthTb);
String dataViewName3a24hb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, "", monthHb);
DepartDrugResult departDrugResult = fReportItemvMapper.getYhData(month,monthTb,monthHb,
dataViewName3a24,dataViewName3a24tb,dataViewName3a24hb);
if(departDrugResult == null){
......@@ -186,7 +183,7 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
//月产水量
Map<String,String> cslMap = commonQueryCsl(departIds, dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
String dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departIds, dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
String dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departIds, dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
String sql = "select aaa.CSL 'csl' ,aaa.depart_id , d.depart_name, fi.pro_scale*10000 'pro_scale' from "+ dataViewName2119 +" aaa";
sql += " left join sys_factory_info fi on fi.depart_id = aaa.depart_id";
sql += " left join sys_depart d on d.id = aaa.depart_id";
......@@ -224,7 +221,7 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
//通用csl查询，返回Map<部门编号，CSL出水量>
public Map<String,String> commonQueryCsl(String departIds ,String startTime ,String endTime){
Map<String,String> cslMap = new HashMap<>();
String dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departIds, startTime,endTime);
String dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departIds, startTime,endTime);
// System.out.println("dataViewName2119 ="+dataViewName2119 );
List<Map<String, Object>> dataMapList = getJdbcTemplate().queryForList(dataViewName2119);
if(dataMapList != null){
......
sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/controller/CustomConsumeController.java
......@@ -32,17 +32,18 @@ public class CustomConsumeController {
/**
* <pre>
* 自定义分析获取数据类型
* 自定义分析获取数据类型
* </pre>
* @param granularity 时间粒度
* @return
* @author Li Yuanyuan, 2021年1月29日 下午3:07:12
*/
@ApiOperation(value="自定义分析获取数据类型", notes="自定义分析获取数据类型")
@GetMapping(value = "/getDataType")
public Result<List<TreeData>> getDataType(){
public Result<List<TreeData>> getDataType(String granularity){
Result<List<TreeData>> result = new Result<List<TreeData>>();
List<TreeData> dataTypeList = new ArrayList<TreeData>();
dataTypeList = customConsumeService.getDataType();
dataTypeList = customConsumeService.getDataType(granularity);
result.setResult(dataTypeList);
result.setSuccess(true);
return result;
......@@ -140,9 +141,9 @@ public class CustomConsumeController {
@ApiOperation(value="填报指标获取", notes="填报指标获取")
@GetMapping(value = "/queryDataFillIndex")
public Result<List<Map<String,Object>>> queryDataFillIndex(String reportId) {
public Result<List<Map<String,Object>>> queryDataFillIndex(String reportId,String granularity) {
Result<List<Map<String,Object>>> result = new Result<List<Map<String,Object>>>();
List<Map<String, Object>> list = customConsumeService.queryDataFillIndex(reportId);
List<Map<String, Object>> list = customConsumeService.queryDataFillIndex(reportId,granularity);
result.setResult(list);
result.setSuccess(true);
return result;
......
sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/entity/AnalyseCustomConsume.java
......@@ -41,4 +41,9 @@ public class AnalyseCustomConsume {
@Excel(name = "历史指标标记名称", width = 15)
@ApiModelProperty(value = "历史指标标记名称")
private java.lang.String analyseTitle;
@Excel(name = "分析指标时间粒度", width = 15)
@ApiModelProperty(value = "分析指标时间粒度")
private java.lang.String analyseGranularity;
}
......
sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/service/ICustomConsumeService.java
......@@ -54,7 +54,7 @@ public interface ICustomConsumeService {
* @return
* @author Li Yuanyuan, 2021年1月29日 下午3:10:42
*/
public List<TreeData> getDataType();
public List<TreeData> getDataType(String granularity);
/**
* <pre>
* 实时数据/水质水量
......@@ -89,10 +89,11 @@ public interface ICustomConsumeService {
* 报表数据项获取
* </pre>
* @param reportId
* @param granularity 时间粒度
* @return
* @author Li Yuanyuan, 2021年2月3日 下午3:39:44
*/
public List<Map<String, Object>> queryDataFillIndex(String reportId);
public List<Map<String, Object>> queryDataFillIndex(String reportId,String granularity);
}
......
sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/service/impl/CustomConsumeServiceImpl.java
......@@ -274,7 +274,7 @@ public class CustomConsumeServiceImpl implements ICustomConsumeService {
pattern = "yyyy-MM";
type = "year";
}
List<Map<String, Object>> list = reportItemService.getReportItemData(departId,reportId, startTime, endTime, indexs);
List<Map<String, Object>> list = reportItemService.getReportItemData(departId,reportId, startTime, endTime, indexs,granularity);
//获取部门数据
List<Map<String, Object>> handleList = new ArrayList<Map<String,Object>>();//接收处理结果
String[] factoryArray = departId.split(",");
......@@ -366,7 +366,7 @@ public class CustomConsumeServiceImpl implements ICustomConsumeService {
if(!StringUtils.isEmpty(contrastType)&&contrastType.contains("tb")) {
String tbStartTime = DateUtils.formatAddTime(startTime,pattern,Calendar.YEAR,-1);
String tbEndTime = DateUtils.formatAddTime(endTime,pattern,Calendar.YEAR,-1);
List<Map<String, Object>> tbList =reportItemService.getReportItemData(departId,reportId, tbStartTime, tbEndTime, indexs);
List<Map<String, Object>> tbList =reportItemService.getReportItemData(departId,reportId, tbStartTime, tbEndTime, indexs,granularity);
for(Map<String, Object> map : tbList) {
tbMap.put(ConvertUtils.getString(map.get("time")+""+map.get("departId")), map);
}
......@@ -374,7 +374,7 @@ public class CustomConsumeServiceImpl implements ICustomConsumeService {
if(!StringUtils.isEmpty(contrastType)&&contrastType.contains("hb")) {
String hbStartTime = DateUtils.formatAddTime(startTime,pattern,Calendar.MONTH,-1);
String hbEndTime = DateUtils.formatAddTime(endTime,pattern,Calendar.MONTH,-1);
List<Map<String, Object>> hbList =reportItemService.getReportItemData(departId,reportId, hbStartTime, hbEndTime, indexs);
List<Map<String, Object>> hbList =reportItemService.getReportItemData(departId,reportId, hbStartTime, hbEndTime, indexs,granularity);
for(Map<String, Object> map : hbList) {
hbMap.put(ConvertUtils.getString(map.get("time")+""+map.get("departId")), map);
}
......@@ -402,26 +402,31 @@ public class CustomConsumeServiceImpl implements ICustomConsumeService {
}
@Override
public List<TreeData> getDataType() {
public List<TreeData> getDataType(String granularity) {
List<Map<String,Object>> dataTypeList = new ArrayList<Map<String,Object>>();
Map<String,Object> ssmap = new HashMap<String,Object>();
ssmap.put("id", "ss");
ssmap.put("pid", "");
ssmap.put("title", "实时");
dataTypeList.add(ssmap);
Map<String,Object> szmap = new HashMap<String,Object>();
szmap.put("id", "sz");
szmap.put("pid", "ss");
szmap.put("title", "采集数据");
if("hour".equals(granularity)||"day".equals(granularity)) {
dataTypeList.add(ssmap);
dataTypeList.add(szmap);
}
Map<String,Object> tbmap = new HashMap<String,Object>();
tbmap.put("id", "tb");
tbmap.put("pid", "");
tbmap.put("title", "填报");
dataTypeList.add(szmap);
dataTypeList.add(tbmap);
if("day".equals(granularity)||"month".equals(granularity)) {
dataTypeList.add(tbmap);
}
QueryWrapper<FReportManage> fReportManageQueryWrapper = new QueryWrapper<>();
fReportManageQueryWrapper.eq("status","1");
fReportManageQueryWrapper.eq("pro_status","1");
fReportManageQueryWrapper.eq("time_type", granularity);
fReportManageQueryWrapper.orderByAsc("sort_num");
List<FReportManage> fReportManages = reportManageService.list(fReportManageQueryWrapper);
for (FReportManage fReportManage : fReportManages) {
......@@ -431,6 +436,12 @@ public class CustomConsumeServiceImpl implements ICustomConsumeService {
report.put("title", fReportManage.getReportName());
dataTypeList.add(report);
}
//填报追加公式计算字段
Map<String, Object> formulaReport = new HashMap<>();
formulaReport.put("id", "formula");
formulaReport.put("pid", "tb");
formulaReport.put("title", "填报计算");
dataTypeList.add(formulaReport);
//将业务数据转换为构造树所需的数据结构
List<TransTreeModel> transTreeModels = dataTypeList.stream().map(bo -> convertToTreeModel(bo)).collect(Collectors.toList());
List<TreeData> treeList=TreeUtils.buildTreeByRootId(transTreeModels, "");
......@@ -477,9 +488,14 @@ public class CustomConsumeServiceImpl implements ICustomConsumeService {
}
@Override
public List<Map<String, Object>> queryDataFillIndex(String reportId) {
public List<Map<String, Object>> queryDataFillIndex(String reportId,String granularity) {
JdbcTemplate masterDB = (JdbcTemplate)SpringContextUtils.getBean("master");
List<Map<String, Object>> list = masterDB.queryForList("select item_code as indexCode,item_alias as indexName,unit as indexUnit from f_report_item where report_id='"+reportId+"' and is_use_power_analyse='1' order by sort_num");
List<Map<String, Object>> list = null;
if("formula".equals(reportId)) {
list = masterDB.queryForList("select formula_code as indexCode,formula_name as indexName,formula_unit as indexUnit from f_report_itemv_formula where report_id='"+reportId+"' and formula_granularity='"+granularity+"' order by sort_num");
}else {
list = masterDB.queryForList("select item_code as indexCode,item_alias as indexName,unit as indexUnit from f_report_item where report_id='"+reportId+"' and is_use_power_analyse='1' order by sort_num");
}
return list;
}
}
......
sk-module-biz/src/main/java/com/skua/modules/emergency/controller/DangerousOperationController.java
......@@ -235,7 +235,7 @@ public class DangerousOperationController {
dangerousOperationService.updateById(dangerOperation);
//流程进入下一节点，并行网关设置判定条件
Map<String, Object> mapVariable = new HashMap<String,Object>();
mapVariable.put("dangerDeal", "taskUser_"+dangerousOperation.getOperationUser());
mapVariable.put("dangerDeal", "taskUser_"+dangerousOperation.getAppointUser());
flowService.configureVariables(executionId, mapVariable);
//动态设置流程接收人
flowBusinessService.completeTask(ProcessConstant.PASS_KEY, dangerousOperation.getFlow());
......
sk-module-biz/src/main/java/com/skua/modules/emergency/entity/DangerousOperation.java
......@@ -145,4 +145,8 @@ public class DangerousOperation extends FlowEntity {
@TableField(exist = false)
@ApiModelProperty(value = "结束时间")
private String endTime;
@TableField(exist = false)
@ApiModelProperty(value = "指定人")
private String appointUser;
}
......
sk-module-biz/src/main/java/com/skua/modules/flow/service/FlowForThirdBusinessService.java 0 → 100644
package com.skua.modules.flow.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.skua.modules.flow.core.entity.BladeFlow;
import com.skua.modules.flow.core.entity.FlowAssemblyEntity;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* 流程业务类
*
* @author Jkadmin
*/
public interface FlowForThirdBusinessService {
/**
* 流程待签列表
* @param bladeFlow 流程类
* @return
*/
List<BladeFlow> selectClaimPage(BladeFlow bladeFlow, String userId, String roles);
/**
* 流程待办列表
* @param bladeFlow 流程类
* @return
*/
List<BladeFlow> selectTodoPage(BladeFlow bladeFlow, String userId);
}
sk-module-biz/src/main/java/com/skua/modules/process/controller/ProcessStatisticsController.java
......@@ -4,20 +4,28 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.core.api.ISysBaseAPI;
import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.context.SpringContextUtils;
import com.skua.core.util.DateUtils;
import com.skua.modules.equipment.entity.EquipmentMaintainTask;
import com.skua.modules.equipment.service.IEquipmentMaintainTaskService;
import com.skua.modules.flow.business.service.FlowBusinessService;
import com.skua.modules.flow.core.entity.BladeFlow;
import com.skua.modules.flow.core.utils.TaskUtil;
import com.skua.modules.flow.service.FlowForThirdBusinessService;
import com.skua.modules.inspection.entity.InspectionUserWorkingGroup;
import com.skua.modules.inspection.service.IInspectionTaskService;
import com.skua.modules.inspection.service.IInspectionUserWorkingGroupService;
import com.skua.modules.process.vo.ProcessStatisticsVO;
import com.skua.modules.process.vo.ThirdProcessVO;
import com.skua.modules.quartz.util.BaseUtil;
import com.skua.modules.system.entity.SysUser;
import com.skua.modules.system.entity.SysUserRole;
import com.skua.modules.system.service.ISysUserRoleService;
import com.skua.modules.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -27,8 +35,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@Api(tags="测试流程")
......@@ -37,15 +46,21 @@ import java.util.List;
public class ProcessStatisticsController {
@Autowired
private ISysUserService sysUserService;
@Autowired
private ISysBaseAPI sysBaseAPI;
@Autowired
private FlowBusinessService flowBusinessService;
@Autowired
private FlowForThirdBusinessService flowForThirdBusinessService;
@Autowired
private IEquipmentMaintainTaskService equipMaintainExecuteService;
@Autowired
private IInspectionTaskService inspectionTaskService;
@Autowired
private IInspectionUserWorkingGroupService inspectionUserWorkingGroupService;
/* 问题上报流程 problemReport
/* 问题上报流程 problemReport
设备维修流程 EquipmentRepair
设备缺陷管理 EquipmentDefectManagement
事故事件流程 EmergencyRiskEvent
......@@ -60,9 +75,6 @@ public class ProcessStatisticsController {
public Result<List<ProcessStatisticsVO>> statistics() {
Result<List<ProcessStatisticsVO>> result = new Result<List<ProcessStatisticsVO>>();
List<ProcessStatisticsVO> processStatisticsList = new ArrayList<>();
/* String taskUser = TaskUtil.getTaskUser();
String taskGroup = TaskUtil.getCandidateGroup();*/
String userId = BaseContextHandler.getUserId();
IPage<BladeFlow> page = new Page<BladeFlow>();
page.setCurrent(1);
......@@ -70,8 +82,6 @@ public class ProcessStatisticsController {
BladeFlow bladeFlow = new BladeFlow();
try {
//巡检任务、维修任务、保养任务、危险作业、事故事件、安全隐患、、药剂入库
String process_key = "AjhRectification";
processStatisticsList.add( queryProcessStatistics("安全隐患", process_key,page,bladeFlow) ) ;
process_key = "problemReport";
......@@ -91,8 +101,6 @@ public class ProcessStatisticsController {
ProcessStatisticsVO maintainerProcessStatisticsVO = new ProcessStatisticsVO("保养任务" ,"" , "0", baoyangTodoCount.toString() );
processStatisticsList.add( maintainerProcessStatisticsVO );
//巡检
//得到巡检任务
//得到进行中的任务
......@@ -155,20 +163,7 @@ public class ProcessStatisticsController {
return result;
}
/***
* @param process_key
* @return
*/
/* private ProcessStatisticsVO queryProcessStatistics(String processName,String process_key,String taskUser , String taskGroup){
TaskQuery taskQuery = taskService.createTaskQuery();
taskQuery.processDefinitionKey( process_key );
Long todoCount = taskQuery.taskAssignee(taskUser).count();//代办人数
Long claimCount = taskQuery.taskCandidateGroupIn( Func.toStrList(taskGroup) ).count() ;//todoCount
return new ProcessStatisticsVO(processName ,process_key , todoCount.toString(), claimCount.toString() );
}*/
private ProcessStatisticsVO queryProcessStatistics(String processName, String process_key, IPage<BladeFlow> page,BladeFlow bladeFlow){
private ProcessStatisticsVO queryProcessStatistics(String processName, String process_key, IPage<BladeFlow> page,BladeFlow bladeFlow){
// String repairProcessDefinitionKey = "equipServicewx";
bladeFlow.setProcessDefinitionKey(process_key);
long repairClaimCount = flowBusinessService.selectClaimPage(page, bladeFlow).getTotal();
......@@ -177,4 +172,56 @@ public class ProcessStatisticsController {
return new ProcessStatisticsVO(processName ,process_key , repairToDoCount+"", repairClaimCount+"" );
}
@AutoLog(value = "第三方获取待办流程" )
@ApiOperation(value="第三方获取待办流程", notes="第三方获取待办流程")
@GetMapping(value = "/getProcessByPhone")
public Result<Map<String,Object>> getProcessByPhone(String phone) {
Result<Map<String,Object>> result = new Result<Map<String,Object>>();
Map<String,Object> map = new HashMap<>();
List<ThirdProcessVO> list = new ArrayList<>();
SysUser sysUser = sysUserService.getUserByPhone(phone);
if(sysUser!=null){
String userName = sysUser.getRealname();
BladeFlow bladeFlow = new BladeFlow();
List<BladeFlow> claimList = new ArrayList<>();
List<BladeFlow> todoList = new ArrayList<>();
List<String> roleList = sysBaseAPI.getRolesByUserId(sysUser.getId());
String roles = roleList.stream().map(s -> s.trim()).collect(Collectors.joining(","));
if(roleList.size() > 0){
claimList = flowForThirdBusinessService.selectClaimPage(bladeFlow, sysUser.getId(), roles);
for (BladeFlow claim : claimList) {
ThirdProcessVO claimVO = new ThirdProcessVO();
claimVO.setMsgid(claim.getTaskId());
claimVO.setMessagenote(claim.getBusinessDesc());
if(claim.getCreateTime()!=null){
claimVO.setSenddate(DateUtils.format(new Date(), "YYYY-MM-dd"));
}
claimVO.setCheckcode(phone);
claimVO.setCheckname(userName);
claimVO.setSendercode(phone);
claimVO.setSendername(userName);
list.add(claimVO);
}
}
todoList = flowForThirdBusinessService.selectTodoPage(bladeFlow, sysUser.getId());
for (BladeFlow todo : todoList) {
ThirdProcessVO todoVO = new ThirdProcessVO();
todoVO.setMsgid(todo.getTaskId());
todoVO.setMessagenote(todo.getBusinessDesc());
if(todo.getCreateTime()!=null){
todoVO.setSenddate(DateUtils.format(new Date(), "YYYY-MM-dd"));
}
todoVO.setCheckcode(phone);
todoVO.setCheckname(userName);
todoVO.setSendercode(phone);
todoVO.setSendername(userName);
list.add(todoVO);
}
}
map.put("DATAS",list);
map.put("COUNT",list.size());
result.setResult(map);
return result;
}
}
......
sk-module-biz/src/main/java/com/skua/modules/process/vo/ThirdProcessVO.java 0 → 100644
package com.skua.modules.process.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value="待办数据传输对象", description="待办数据传输对象")
public class ThirdProcessVO {
@ApiModelProperty(value = "待办唯一标识ID")
private String msgid;
@ApiModelProperty(value = "PC端待办链接")
private String messageurlpc;
@ApiModelProperty(value = "移动端待办链接")
private String messageurlmobile;
@ApiModelProperty(value = "创建人手机号")
private String sendercode;
@ApiModelProperty(value = "创建人姓名")
private String sendername;
@ApiModelProperty(value = "待办标题")
private String messagenote;
@ApiModelProperty(value = "待办接收日期")
private String senddate;
@ApiModelProperty(value = "审批人手机号")
private String checkcode;
@ApiModelProperty(value = "审批人姓名")
private String checkname;
}
sk-module-biz/src/main/java/com/skua/modules/threedimensional/service/impl/ScreenDataServiceImpl.java
package com.skua.modules.threedimensional.service.impl;
import com.skua.common.constant.ReportConstant;
import com.skua.common.report.ReportViewUtil;
import com.skua.core.service.IFactoryInfoService;
import com.skua.core.util.DateUtils;
......@@ -30,8 +31,6 @@ public class ScreenDataServiceImpl implements IScreenDataService {
private IFactoryInfoService factoryInfoService;
@Resource
private ScreenMapper screenMapper;
private static String view3a24 = "3a243d5715b9e1a3753c180872ca0df9";
private static String view2119 = "2119ecbf53a1d2d0708258ff67cfd9e1";
@Override
public Map<String, Object> getDifferData(String startDate, String itemTags, String departId, String type, JdbcTemplate masterDB) {
......@@ -219,8 +218,8 @@ public class ScreenDataServiceImpl implements IScreenDataService {
String departIds = statisticsParams.getDepartIds();
Map<String, Object> valueMap = new HashMap<>();
List<String> monthList = getMonthsBetween(startDate,endDate);
String dataViewName3a24 = ReportViewUtil.buildView(view3a24, "DLHJ", departIds, startDate, endDate);
String dataViewName2119 = ReportViewUtil.buildView(view2119,"CSL", departIds, startDate, endDate);
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, "DLHJ", departIds, startDate, endDate);
String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, startDate, endDate);
List<Map<String, Object>> dataList = screenMapper.getYhdlqs(startDate,endDate,departIds,dataViewName3a24,dataViewName2119);
if(dataList.size()>0){
for (Map<String, Object> vMap : dataList) {
......@@ -264,8 +263,8 @@ public class ScreenDataServiceImpl implements IScreenDataService {
List<String> monthList = getMonthsBetween(startDate,endDate);
String field3a24 = "PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ," +
"YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
String dataViewName3a24 = ReportViewUtil.buildView(view3a24, field3a24, departIds, startDate, endDate);
String dataViewName2119 = ReportViewUtil.buildView(view2119,"CSL", departIds, startDate, endDate);
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, field3a24, departIds, startDate, endDate);
String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, startDate, endDate);
List<Map<String, Object>> dataList = screenMapper.getYhylqs(startDate,endDate,departIds,dataViewName3a24,dataViewName2119);
if(dataList.size()>0){
for (Map<String, Object> vMap : dataList) {
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
package com.skua.modules.custom.service.impl;
import com.skua.common.constant.ReportConstant;
import com.skua.common.report.ReportViewUtil;
import com.skua.core.context.SpringContextUtils;
import com.skua.modules.custom.entity.FCustomReportDataset;
......@@ -25,9 +26,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDatasetMapper, FCustomReportDataset> implements IFCustomReportDatasetService {
private static String view2119 = "2119ecbf53a1d2d0708258ff67cfd9e1";
private static String view3a24 = "3a243d5715b9e1a3753c180872ca0df9";
private static String view4411 = "4411ed3d78634bcdcd700f6e33724025";
@Autowired
private FCustomReportDatasetMapper mapper;
/* (non-Javadoc)
......@@ -72,17 +70,17 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
public List<Map<String, Object>> getDataFromHY(String dataTime, String departId) {
List<Map<String, Object>> valueMapList = new ArrayList<>();
String tbYear = String.valueOf(Integer.parseInt(dataTime) - 1);
String dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departId, dataTime);
String dataViewName2119tb = ReportViewUtil.buildViewLike(view2119,"CSL", departId, tbYear);
String dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, dataTime);
String dataViewName2119tb = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, tbYear);
String field3a24 = "DLHJ,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ," +
"YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
String dataViewName3a24 = ReportViewUtil.buildViewLike(view3a24,field3a24, departId, dataTime);
String dataViewName3a24tb = ReportViewUtil.buildViewLike(view3a24,field3a24, departId, tbYear);
String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, dataTime);
String dataViewName3a24tb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, tbYear);
String field4411 = "yslwcbl,ysjsldyqntqyy,qntqsfsl,ysfsl,sfsldbbhl,sldyyqyy,dhgyqntqyy,yyf,yhgyqntqyy,dhcmbzyy,yhcyqyy";
String dataViewName4411 = ReportViewUtil.buildViewLike(view4411,field4411, departId, dataTime);
String dataViewName4411tb = ReportViewUtil.buildViewLike(view4411,"qntqsfsl", departId, tbYear);
String dataViewName4411 = ReportViewUtil.buildViewLike(ReportConstant.view4411,field4411, departId, dataTime);
String dataViewName4411tb = ReportViewUtil.buildViewLike(ReportConstant.view4411,"qntqsfsl", departId, tbYear);
//主库数据源
JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
String sql = "select " +
......@@ -169,9 +167,9 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
String endDate = weekMap.get("end");
String field3a24 = "DLHJ,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ," +
"YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2,WNL";
String dataViewName3a24 = ReportViewUtil.buildView(view3a24, field3a24, "", startDate, endDate);
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, field3a24, "", startDate, endDate);
String field2119 = "CSL,JSCOD,JSAD,JSPH,JSZD,JSZL,JSSS,CSCOD,CSAD,CSPH,CSTN,CSZL,CSSS";
String dataViewName2119 = ReportViewUtil.buildView(view2119,field2119, "", startDate, endDate);
String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,field2119, "", startDate, endDate);
valueMap = mapper.getWeekReport(dataTime, departId, week, startDate, endDate, dataViewName3a24, dataViewName2119);
if(valueMap==null){
valueMap = new HashMap<>();
......@@ -217,8 +215,8 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
String start = month.substring(0,4)+"-01-31";
String end = month + "-31";
String departIds = mapper.getChildDepartId(departId);
String dataViewName2 = ReportViewUtil.buildView(view2119,"CSL", departIds, start, end);
String dataViewName3 = ReportViewUtil.buildView(view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, start, end);
String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, start, end);
String dataViewName3 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", departIds, start, end);
List<JnhbReportData> list = mapper.getJnhbReport(dataViewName2, dataViewName3, start, end, departIds);
return list;
}
......@@ -230,8 +228,8 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
List<JnhbReportDetailsJs> jsList = new ArrayList<>();
List<JnhbReportDetailsHj> hjList = new ArrayList<>();
String year = month.substring(0,4);
String dataViewName2 = ReportViewUtil.buildViewLike(view2119,"CSL", departId, year);
String dataViewName3 = ReportViewUtil.buildViewLike(view3a24,"", departId, year);
String dataViewName2 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, year);
String dataViewName3 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"", departId, year);
dyList = mapper.getDyList(dataViewName2, dataViewName3, departId, year);
jsList = mapper.getJsList(dataViewName2, dataViewName3, departId, year);
hjList = mapper.getHjList(dataViewName2, dataViewName3, departId, year);
......@@ -246,21 +244,21 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
long startTime = System.nanoTime();
JnhbLargeScreenVO largeScreenVO = new JnhbLargeScreenVO();
//当月数据
String dataViewName2 = ReportViewUtil.buildView(view2119,"CSL", null, dataVO.getNowStartTime(), dataVO.getNowEndTime());
String dataViewName3 = ReportViewUtil.buildView(view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", null, dataVO.getNowStartTime(), dataVO.getNowEndTime());
String dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", null, dataVO.getNowStartTime(), dataVO.getNowEndTime());
String dataViewName3 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", null, dataVO.getNowStartTime(), dataVO.getNowEndTime());
List<JnhbReportData> jnhbReportDataList = mapper.getJnhbReport(dataViewName2, dataViewName3, dataVO.getNowStartTime(), dataVO.getNowEndTime(), null);
//System.out.println("1111---**************执行时间："+ (System.nanoTime() - startTime) / 1_000_000.0 + " milliseconds");
// 上月数据 同比
dataViewName2 = ReportViewUtil.buildView(view2119,"CSL", null, dataVO.getLastMonthStartTime(), dataVO.getLastMonthEndTime());
dataViewName3 = ReportViewUtil.buildView(view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", null, dataVO.getLastMonthStartTime(), dataVO.getLastMonthEndTime());
dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", null, dataVO.getLastMonthStartTime(), dataVO.getLastMonthEndTime());
dataViewName3 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", null, dataVO.getLastMonthStartTime(), dataVO.getLastMonthEndTime());
List<JnhbReportData> lastMonthReportDataList = mapper.getJnhbReport(dataViewName2, dataViewName3, dataVO.getLastMonthStartTime(), dataVO.getLastMonthEndTime(), null);
//System.out.println("2222---**************执行时间："+ (System.nanoTime() - startTime) / 1_000_000.0 + " milliseconds");
Map<String,JnhbReportData> lastMonthMapData= convertJnhbReportDataMap(lastMonthReportDataList);
// 去年数据 环比
dataViewName2 = ReportViewUtil.buildView(view2119,"CSL", null, dataVO.getLastYearStartTime(), dataVO.getLastYearEndTime());
dataViewName3 = ReportViewUtil.buildView(view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", null, dataVO.getLastYearStartTime(), dataVO.getLastYearEndTime());
dataViewName2 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", null, dataVO.getLastYearStartTime(), dataVO.getLastYearEndTime());
dataViewName3 = ReportViewUtil.buildView(ReportConstant.view3a24,"DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", null, dataVO.getLastYearStartTime(), dataVO.getLastYearEndTime());
List<JnhbReportData> lastYearReportDataList = mapper.getJnhbReport(dataViewName2, dataViewName3, dataVO.getLastYearStartTime(), dataVO.getLastYearEndTime(), null);
Map<String,JnhbReportData> lastYearMapData= convertJnhbReportDataMap(lastYearReportDataList);
......@@ -399,8 +397,8 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
String endDate = weekMap.get("end");
String field3a24 = "DLHJ,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ," +
"YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2,WNL";
String dataViewName3a24 = ReportViewUtil.buildView(view3a24, field3a24, "", startDate, endDate);
String dataViewName2119 = ReportViewUtil.buildView(view2119,"CSL", "", startDate, endDate);
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, field3a24, "", startDate, endDate);
String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", "", startDate, endDate);
list = mapper.getWeekReportData(startDate, endDate, dataViewName3a24, dataViewName2119);
map.put("start", startDate);//开始时间
map.put("end", endDate);//结束时间
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/FactoryOperateCenterController.java 0 → 100644
package com.skua.modules.dataAnalysis.controller;
import com.skua.core.api.vo.Result;
import com.skua.modules.dataAnalysis.service.IFactoryCenterService;
import com.skua.modules.dataAnalysis.service.IFactoryOperateCenterService;
import com.skua.modules.dataAnalysis.vo.StatisticsParam;
import com.skua.modules.dataAnalysis.vo.WaterQualityMonitoringDetailVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Api(tags = "厂区运营考核中心")
@RestController
@RequestMapping("/v1/operate")
public class FactoryOperateCenterController {
@Autowired
private IFactoryOperateCenterService factoryOperateCenterService;
@ApiOperation(value="厂区统计数据", notes="厂区统计数据")
@GetMapping(value = "/getData")
public Result<Map<String,Object>> getData(String departId,String month) {
Result<Map<String,Object>> result = new Result<Map<String,Object>>();
Map<String,Object> map = factoryOperateCenterService.getData(departId,month);
result.setSuccess(true);
result.setResult(map);
return result;
}
}
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/FactoryOperateCenterMapper.java 0 → 100644
package com.skua.modules.dataAnalysis.mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface FactoryOperateCenterMapper {
Map<String, Object> getData(@Param("month") String month, @Param("departId") String departId,
@Param("view3a24") String view3a24, @Param("view2119") String view2119);
}
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/xml/FactoryOperateCenterMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.dataAnalysis.mapper.FactoryCenterMapper">
<select id="getData" resultType="java.util.HashMap">
SELECT
ROUND(SUM( v3.DLHJ )/10000,2) AS yzdl,
ROUND(AVG( v3.DLHJ )/10000,2) AS rjdl,
ROUND(SUM( v3.WNL ),2) AS yzcnl,
ROUND(SUM( v2.CSL )/10000,2) AS yclsl,
ROUND(SUM( v3.DLHJ )/SUM( v2.CSL ),2) as dsdh,
ROUND(AVG( v2.CSL )/10000,2) AS rjclsl,
ROUND(SUM( v3.WNL )/(SUM( v2.CSL )/10000),2) as wdscnl,
LEFT ( v3.time, 7 ) AS time
FROM
${view3a24} v3
LEFT JOIN (select v.CSL,v.time from ${view2119} v where LEFT ( v.time, 7 ) = #{month} and v.depart_id = #{departId}) v2 ON v2.time = v3.time
where LEFT ( v3.time, 7 ) = #{month}
and v3.depart_id = #{departId}
</select>
</mapper>
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/IFactoryOperateCenterService.java 0 → 100644
package com.skua.modules.dataAnalysis.service;
import java.util.Map;
public interface IFactoryOperateCenterService {
Map<String, Object> getData(String departId,String month);
}
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
package com.skua.modules.dataAnalysis.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.skua.common.constant.ReportConstant;
import com.skua.common.report.ReportViewUtil;
import com.skua.core.context.SpringContextUtils;
import com.skua.core.service.IFactoryInfoService;
......@@ -40,9 +41,6 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
@Autowired
private ISysMonitorMetricInfoService sysMonitorMetricInfoService;
private static String view3a24 = "3a243d5715b9e1a3753c180872ca0df9";
private static String view2119 = "2119ecbf53a1d2d0708258ff67cfd9e1";
@Override
public List<WaterQualityMonitoringDetailVO> queryMonitoringData(String departId) {
List<WaterQualityMonitoringDetailVO> list = new ArrayList<>();
......@@ -195,14 +193,14 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
Map<String, Object> map = new HashMap<>();
String monthTb = DateUtils.getTbMonth(month);
String monthHb = DateUtils.getHbMonth(month);
String dataViewName3a24 = ReportViewUtil.buildViewLike(view3a24,"DLHJ,WNL", departId, month);
String dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departId, month);
String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ,WNL", departId, month);
String dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, month);
Map<String, Object> valueMap = factoryCenterMapper.getData(month, departId, dataViewName3a24, dataViewName2119);
String dataViewName3a24Hb = ReportViewUtil.buildViewLike(view3a24,"DLHJ,WNL", departId, monthHb);
String dataViewName2119Hb = ReportViewUtil.buildViewLike(view2119,"CSL", departId, monthHb);
String dataViewName3a24Hb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ,WNL", departId, monthHb);
String dataViewName2119Hb = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, monthHb);
Map<String, Object> hbValueMap = factoryCenterMapper.getData(monthHb, departId, dataViewName3a24Hb, dataViewName2119Hb);
String dataViewName3a24Tb = ReportViewUtil.buildViewLike(view3a24,"DLHJ,WNL", departId, monthTb);
String dataViewName2119Tb = ReportViewUtil.buildViewLike(view2119,"CSL", departId, monthTb);
String dataViewName3a24Tb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ,WNL", departId, monthTb);
String dataViewName2119Tb = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, monthTb);
Map<String, Object> tbValueMap = factoryCenterMapper.getData(monthTb, departId, dataViewName3a24Tb, dataViewName2119Tb);
map.put("yclsl",new HashMap<>());
Map<String, Object> yclslMap = new HashMap<>();
......@@ -294,10 +292,10 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
String endDate = statisticsParam.getEndDate();
String startDateTb = DateUtils.getTbDate(startDate);
String endDateTb = DateUtils.getTbDate(endDate);
String dataView3a24 = ReportViewUtil.buildView(view3a24, "WNL", statisticsParam.getDepartId(), startDate,endDate);
String dataView3a24tb = ReportViewUtil.buildView(view3a24, "WNL", statisticsParam.getDepartId(), startDateTb,endDateTb);
String dataView2119 = ReportViewUtil.buildView(view2119, "CSL", statisticsParam.getDepartId(), startDate,endDate);
String dataView2119tb = ReportViewUtil.buildView(view2119, "CSL", statisticsParam.getDepartId(), startDateTb,endDateTb);
String dataView3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, "WNL", statisticsParam.getDepartId(), startDate,endDate);
String dataView3a24tb = ReportViewUtil.buildView(ReportConstant.view3a24, "WNL", statisticsParam.getDepartId(), startDateTb,endDateTb);
String dataView2119 = ReportViewUtil.buildView(ReportConstant.view2119, "CSL", statisticsParam.getDepartId(), startDate,endDate);
String dataView2119tb = ReportViewUtil.buildView(ReportConstant.view2119, "CSL", statisticsParam.getDepartId(), startDateTb,endDateTb);
list = factoryCenterMapper.getCnltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId(),
dataView3a24,dataView3a24tb,dataView2119,dataView2119tb);
if(list.size() == 0){
......@@ -322,10 +320,10 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
String endDate = statisticsParam.getEndDate();
String startDateTb = DateUtils.getTbDate(startDate);
String endDateTb = DateUtils.getTbDate(endDate);
String dataView3a24 = ReportViewUtil.buildView(view3a24, "DLHJ", statisticsParam.getDepartId(), startDate,endDate);
String dataView3a24tb = ReportViewUtil.buildView(view3a24, "DLHJ", statisticsParam.getDepartId(), startDateTb,endDateTb);
String dataView2119 = ReportViewUtil.buildView(view2119, "CSL", statisticsParam.getDepartId(), startDate,endDate);
String dataView2119tb = ReportViewUtil.buildView(view2119, "CSL", statisticsParam.getDepartId(), startDateTb,endDateTb);
String dataView3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, "DLHJ", statisticsParam.getDepartId(), startDate,endDate);
String dataView3a24tb = ReportViewUtil.buildView(ReportConstant.view3a24, "DLHJ", statisticsParam.getDepartId(), startDateTb,endDateTb);
String dataView2119 = ReportViewUtil.buildView(ReportConstant.view2119, "CSL", statisticsParam.getDepartId(), startDate,endDate);
String dataView2119tb = ReportViewUtil.buildView(ReportConstant.view2119, "CSL", statisticsParam.getDepartId(), startDateTb,endDateTb);
list = factoryCenterMapper.getHdltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId(),
dataView3a24,dataView3a24tb,dataView2119,dataView2119tb);
if(list.size() == 0){
......@@ -350,8 +348,8 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
String endDate = statisticsParam.getEndDate();
String startDateTb = DateUtils.getTbDate(startDate);
String endDateTb = DateUtils.getTbDate(endDate);
String dataView2119 = ReportViewUtil.buildView(view2119, "CSL", statisticsParam.getDepartId(), startDate,endDate);
String dataView2119tb = ReportViewUtil.buildView(view2119, "CSL", statisticsParam.getDepartId(), startDateTb,endDateTb);
String dataView2119 = ReportViewUtil.buildView(ReportConstant.view2119, "CSL", statisticsParam.getDepartId(), startDate,endDate);
String dataView2119tb = ReportViewUtil.buildView(ReportConstant.view2119, "CSL", statisticsParam.getDepartId(), startDateTb,endDateTb);
list = factoryCenterMapper.getWssltj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId(),dataView2119,dataView2119tb);
if(list.size() == 0){
List<String> monthList = getMonthsBetween(startDate,endDate);
......@@ -374,8 +372,8 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
String startDateTb = DateUtils.getTbDate(startDate);
String endDateTb = DateUtils.getTbDate(endDate);
String yjField = "PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ,YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
String dataView3a24 = ReportViewUtil.buildView(view3a24, yjField, statisticsParam.getDepartId(), startDate,endDate);
String dataView3a24tb = ReportViewUtil.buildView(view3a24, yjField, statisticsParam.getDepartId(), startDateTb,endDateTb);
String dataView3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, yjField, statisticsParam.getDepartId(), startDate,endDate);
String dataView3a24tb = ReportViewUtil.buildView(ReportConstant.view3a24, yjField, statisticsParam.getDepartId(), startDateTb,endDateTb);
list = factoryCenterMapper.getYhtj(startDate,endDate,startDateTb,endDateTb,statisticsParam.getDepartId(),dataView3a24,dataView3a24tb);
if(list.size() == 0){
List<String> monthList = getMonthsBetween(startDate,endDate);
......@@ -537,7 +535,7 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
String startDate = statisticsParam.getStartDate();
String endDate = statisticsParam.getEndDate();
String fields = "CSL,JSCOD,CSCOD,JSAD,CSAD,JSZD,CSTN,JSZL,CSZL";
String dataView2119 = ReportViewUtil.buildView(view2119, fields, statisticsParam.getDepartId(), startDate, endDate);
String dataView2119 = ReportViewUtil.buildView(ReportConstant.view2119, fields, statisticsParam.getDepartId(), startDate, endDate);
list = factoryCenterMapper.getSzXjltj(startDate,endDate,statisticsParam.getDepartId(),dataView2119);
return list;
}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryOperateCenterServiceImpl.java 0 → 100644
package com.skua.modules.dataAnalysis.service.impl;
import com.skua.common.constant.ReportConstant;
import com.skua.common.report.ReportViewUtil;
import com.skua.core.util.ConvertUtils;
import com.skua.modules.dataAnalysis.mapper.FactoryOperateCenterMapper;
import com.skua.modules.dataAnalysis.service.IFactoryOperateCenterService;
import com.skua.tool.util.DateUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@Service
public class FactoryOperateCenterServiceImpl implements IFactoryOperateCenterService {
@Resource
private FactoryOperateCenterMapper factoryOperateCenterMapper;
@Override
public Map<String, Object> getData(String departId, String month) {
Map<String, Object> map = new HashMap<>();
String monthTb = DateUtils.getTbMonth(month);
String monthHb = DateUtils.getHbMonth(month);
String field3a24 = "DLHJ,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,PFS,FHTY,RYXNJ," +
"YWL,GXCLJ,CH3COONA,HXT,FECL3,SH,CH3COOH,FESO4G,FESO4Y,H2O2";
String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, month);
String dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, month);
Map<String, Object> valueMap = factoryOperateCenterMapper.getData(month, departId, dataViewName3a24, dataViewName2119);
String dataViewName3a24Hb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, monthHb);
String dataViewName2119Hb = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, monthHb);
Map<String, Object> hbValueMap = factoryOperateCenterMapper.getData(monthHb, departId, dataViewName3a24Hb, dataViewName2119Hb);
String dataViewName3a24Tb = ReportViewUtil.buildViewLike(ReportConstant.view3a24,field3a24, departId, monthTb);
String dataViewName2119Tb = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, monthTb);
Map<String, Object> tbValueMap = factoryOperateCenterMapper.getData(monthTb, departId, dataViewName3a24Tb, dataViewName2119Tb);
map.put("yclsl",new HashMap<>());
Map<String, Object> yclslMap = new HashMap<>();
yclslMap.put("unit","万吨");
map.put("rjclsl",new HashMap<>());
Map<String, Object> rjclslMap = new HashMap<>();
rjclslMap.put("unit","万吨");
map.put("yzdl",new HashMap<>());
Map<String, Object> yzdlMap = new HashMap<>();
yzdlMap.put("unit","万Kw.h");
map.put("dsdh",new HashMap<>());
Map<String, Object> dsdhMap = new HashMap<>();
dsdhMap.put("unit","Kw.h/吨水");
map.put("yzcnl",new HashMap<>());
Map<String, Object> yzcnlMap = new HashMap<>();
yzcnlMap.put("unit","吨");
map.put("wdscnl",new HashMap<>());
Map<String, Object> wdscnlMap = new HashMap<>();
wdscnlMap.put("unit","吨/万吨");
map.put("rjdl",new HashMap<>());
Map<String, Object> rjdlMap = new HashMap<>();
rjdlMap.put("unit","万Kw.h");
if(valueMap != null){
yclslMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("yclsl")) ? valueMap.get("yclsl").toString() : "-");//月总处理水量
rjclslMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("rjclsl")) ? valueMap.get("rjclsl").toString() : "-");//日均处理水量
yzdlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("yzdl")) ? valueMap.get("yzdl").toString() : "-");//月总电量
dsdhMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("dsdh")) ? valueMap.get("dsdh").toString() : "-");//吨水电耗
yzcnlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("yzcnl")) ? valueMap.get("yzcnl").toString() : "-");//月总产泥量
wdscnlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("wdscnl")) ? valueMap.get("wdscnl").toString() : "-");//万吨水产泥量
rjdlMap.put("value", ConvertUtils.isNotEmpty(valueMap.get("rjdl")) ? valueMap.get("rjdl").toString() : "-");//日均电量
}else{
yclslMap.put("value","-");//月总处理水量
rjclslMap.put("value","-");//日均处理水量
yzdlMap.put("value","-");//月总电量
dsdhMap.put("value","-");//吨水电耗
yzcnlMap.put("value","-");//月总产泥量
wdscnlMap.put("value","-");//万吨水产泥量
rjdlMap.put("value","-");//日均电量
}
if(hbValueMap != null){
yclslMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("yclsl")) ? hbValueMap.get("yclsl").toString() : "-");//月总处理水量
rjclslMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("rjclsl")) ? hbValueMap.get("rjclsl").toString() : "-");//日均处理水量
yzdlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("yzdl")) ? hbValueMap.get("yzdl").toString() : "-");//月总电量
dsdhMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("dsdh")) ? hbValueMap.get("dsdh").toString() : "-");//吨水电耗
yzcnlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("yzcnl")) ? hbValueMap.get("yzcnl").toString() : "-");//月总产泥量
wdscnlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("wdscnl")) ? hbValueMap.get("wdscnl").toString() : "-");//万吨水产泥量
rjdlMap.put("valueHb", ConvertUtils.isNotEmpty(hbValueMap.get("rjdl")) ? hbValueMap.get("rjdl").toString() : "-");//日均电量
}else{
yclslMap.put("valueHb","-");//月总处理水量
rjclslMap.put("valueHb","-");//日均处理水量
yzdlMap.put("valueHb","-");//月总电量
dsdhMap.put("valueHb","-");//吨水电耗
yzcnlMap.put("valueHb","-");//月总产泥量
wdscnlMap.put("valueHb","-");//万吨水产泥量
rjdlMap.put("valueHb","-");//日均电量
}
if(tbValueMap != null){
yclslMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("yclsl")) ? tbValueMap.get("yclsl").toString() : "-");//月总处理水量
rjclslMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("rjclsl")) ? tbValueMap.get("rjclsl").toString() : "-");//日均处理水量
yzdlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("yzdl")) ? tbValueMap.get("yzdl").toString() : "-");//月总电量
dsdhMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("dsdh")) ? tbValueMap.get("dsdh").toString() : "-");//吨水电耗
yzcnlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("yzcnl")) ? tbValueMap.get("yzcnl").toString() : "-");//月总产泥量
wdscnlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("wdscnl")) ? tbValueMap.get("wdscnl").toString() : "-");//万吨水产泥量
rjdlMap.put("valueTb", ConvertUtils.isNotEmpty(tbValueMap.get("rjdl")) ? tbValueMap.get("rjdl").toString() : "-");//日均电量
}else{
yclslMap.put("valueTb","-");//月总处理水量
rjclslMap.put("valueTb","-");//日均处理水量
yzdlMap.put("valueTb","-");//月总电量
dsdhMap.put("valueTb","-");//吨水电耗
yzcnlMap.put("valueTb","-");//月总产泥量
wdscnlMap.put("valueTb","-");//万吨水产泥量
rjdlMap.put("valueTb","-");//日均电量
}
//汇总
map.put("yclsl", yclslMap);
map.put("rjclsl", rjclslMap);
map.put("yzdl", yzdlMap);
map.put("dsdh", dsdhMap);
map.put("yzcnl", yzcnlMap);
map.put("wdscnl", wdscnlMap);
map.put("rjdl", rjdlMap);
return map;
}
}
sk-module-datafill/src/main/java/com/skua/modules/job/NFDataSyncJob.java
package com.skua.modules.job;
import com.skua.common.constant.ReportConstant;
import com.skua.core.context.SpringContextUtils;
import com.skua.core.util.DateUtils;
import com.skua.modules.report.service.IReportDataService;
......@@ -23,15 +24,23 @@ public class NFDataSyncJob implements Job {
@Autowired
private IReportDataService reportDataService;
//水质水量报表
private static final String SZSL = "2119ecbf53a1d2d0708258ff67cfd9e1";
//化验日报
private static final String HYRB = "9bffaf9187093d6e6a4390e8c56acca8";
/**
* 若参数变量名修改 QuartzJobController中也需对应修改
*/
private String parameter;
public void setParameter(String parameter) {
this.parameter = parameter;
}
@Override
public void execute(JobExecutionContext jobExecutionContext) {
log.info("开始同步昨日恩菲的数据入报表");
String yesterday = DateUtils.getYesterday();
if(StringUtils.isNotEmpty(this.parameter)){
yesterday = this.parameter;
}
log.info("开始同步【"+yesterday+"】恩菲的数据入报表");
JdbcTemplate nfDb = (JdbcTemplate) SpringContextUtils.getBean("nf-db");
String sql = "select * from day_report_data where update_time like '"+yesterday+"%'";
List<Map<String, Object>> dataList = nfDb.queryForList(sql);
......@@ -47,23 +56,23 @@ public class NFDataSyncJob implements Job {
data.put("time",yesterday);
if("szsl".equals(itemType)){
data.put(itemCode, itemValue);
data.put("reportId", SZSL);
reportDataService.insertOrUpdateReportData(departId, time, data, SZSL);
data.put("reportId", ReportConstant.view2119);
reportDataService.insertOrUpdateReportData(departId, time, data, ReportConstant.view2119);
}else if("hyrb".equals(itemType)){
String indexs = "JSCOD,JSAD,JSPH,JSZD,JSZL,JSSS,CSCOD,CSAD,CSPH,CSTN,CSZL,CSSS";
if(itemCode.indexOf(indexs) > 0){
if(indexs.indexOf(itemCode) > 0){
data.put(itemCode+"HY", itemValue);
}else{
data.put(itemCode, itemValue);
}
data.put("reportId", HYRB);
reportDataService.insertOrUpdateReportData(departId, time, data, HYRB);
data.put("reportId", ReportConstant.view9bff);
reportDataService.insertOrUpdateReportData(departId, time, data, ReportConstant.view9bff);
}else {
log.info("恩菲【"+itemType+"】类型数据未进行数据同步");
}
}
}
log.info("同步昨日恩菲的数据入报表完成");
log.info("恩菲的数据入报表完成");
}
}
......
sk-module-datafill/src/main/java/com/skua/modules/report/service/IFReportItemService.java
......@@ -39,7 +39,7 @@ public interface IFReportItemService extends IService<FReportItem> {
* @return
* @author Li Yuanyuan, 2021年2月3日 下午5:03:47
*/
List<Map<String,Object>> getReportItemData(String departIds,String reportId,String startTime,String endTime,String index);
List<Map<String,Object>> getReportItemData(String departIds,String reportId,String startTime,String endTime,String index,String granularity);
Map<String, Object> getReportData(String reportId, String dataId);
......
sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/FReportItemServiceImpl.java
package com.skua.modules.report.service.impl;
import com.skua.common.report.ReportViewUtil;
import com.skua.modules.report.entity.FReportItem;
import com.skua.modules.report.mapper.FReportItemMapper;
import com.skua.modules.report.service.IFReportItemService;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.apache.commons.lang.StringUtils;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.skua.common.report.CustomReportUtil;
import com.skua.common.report.ReportViewUtil;
import com.skua.core.context.SpringContextUtils;
import com.skua.core.util.ConvertUtils;
import com.skua.modules.report.entity.FReportItem;
import com.skua.modules.report.mapper.FReportItemMapper;
import com.skua.modules.report.service.IFReportItemService;
/**
* 报表数据项管理
......@@ -96,35 +103,104 @@ public class FReportItemServiceImpl extends ServiceImpl<FReportItemMapper, FRepo
return list;
}
//fReportManageQueryWrapper.eq("status","1");
//fReportManageQueryWrapper.eq("pro_status","1");
//fReportManageQueryWrapper.eq("time_type", granularity);
@Override
public List<Map<String, Object>> getReportItemData(String departIds,String reportId, String startTime, String endTime,String indexs) {
public List<Map<String, Object>> getReportItemData(String departIds,String reportId, String startTime, String endTime,String indexs,String granularity) {
String[] indexArray = indexs.split(",");
//查询报表计算指标
JdbcTemplate masterDB = (JdbcTemplate)SpringContextUtils.getBean("master");
String formulaSql = "select formula_code,formula_info from f_report_itemv_formula where formula_granularity='"+granularity+"'";
List<Map<String, Object>> formulaList = masterDB.queryForList(formulaSql);
Map<String,String> formulaMap = new HashMap<String,String>();
for(Map<String,Object> map : formulaList) {
formulaMap.put(ConvertUtils.getString(map.get("formula_code")), ConvertUtils.getString(map.get("formula_info")));
}
//对计算指标进行解析，追加到基础查询指标
Set<String> indexSet = new LinkedHashSet<String>();//查询指标
//存在计算指标，重新构造基础指标集合
String selectPart = "";
String headSelectPart = "";
String formulaIds = "";
for(String index : indexArray) {
selectPart = selectPart+","+index;
headSelectPart = headSelectPart+", max(case when item_code = '"+index+"' then CONCAT(item_alias,'(',unit,')') else '' end) as '"+index+"'";
formulaIds = formulaIds+","+"'"+index+"'";
if(index.contains("formula_")) {
String formula = formulaMap.get(index);
selectPart = selectPart+",round("+formulaMap.get(index).replace("{", "IFNULL(").replace("}", ",0)")+",2) as "+index;
//提取计算指标
List<String> formulaIndexList = CustomReportUtil.getFormulaElement(formula);
for(String formulaIndex : formulaIndexList) {
indexSet.add(formulaIndex);
}
}else {
selectPart = selectPart+","+index;
indexSet.add(index);
}
}
if(!StringUtils.isEmpty(formulaIds)) {
selectPart = selectPart.substring(1);
headSelectPart = headSelectPart.substring(1);
formulaIds = formulaIds.substring(1);
indexs = String.join(",", indexSet);
//对基础查询指标按照报表进行分组
String queryDataFillFieldSql="select item_code,report_id from f_report_item where report_id in(select id from f_report_manage where status='1' and pro_status='1' and time_type='"+granularity+"')";
List<Map<String, Object>> baseDataFillFieldList = masterDB.queryForList(queryDataFillFieldSql);
Map<String,String> fieldToReportIdMap = new HashMap<String,String>();
for(Map<String,Object> map : baseDataFillFieldList) {
fieldToReportIdMap.put(ConvertUtils.getString(map.get("item_code")), ConvertUtils.getString(map.get("report_id")));
}
String headWhereInPart = "item_code IN("+formulaIds+")";
Map<String,String> paramMap = new HashMap<String,String>();
paramMap.put("viewName", ReportViewUtil.buildView(reportId, indexs, departIds, startTime, endTime));
//paramMap.put("viewName", "view_"+reportId.substring(0, 4));
paramMap.put("startTime", startTime);
paramMap.put("endTime", endTime);
paramMap.put("dataSelectPart", selectPart);
paramMap.put("headSelectPart", headSelectPart);
paramMap.put("headWhereInPart", headWhereInPart);
paramMap.put("reportId", reportId);
paramMap.put("departIds", departIds);
return fReportItemMapper.getReportItemData(paramMap);
String[] tempIndexArray = indexs.split(",");
Map<String,List<String>> reportIndexGroup = new HashMap<String,List<String>>();
for(String key : tempIndexArray) {
String tempReportId = fieldToReportIdMap.get(key);
List<String> reportIndexList = reportIndexGroup.get(tempReportId);
if(reportIndexList!=null) {
reportIndexList.add(key);
}else {
reportIndexList = new ArrayList<String>();
reportIndexList.add(key);
reportIndexGroup.put(tempReportId, reportIndexList);
}
}
//基于报表做基础指标查询
Set<String> reportIdSet = reportIndexGroup.keySet();
//构造日期机构主参照表动态视图
String baseViewPattern = "%Y-%m-%d";
String baseViewGranularity = "DAY";
String[] departIdArray = departIds.split(",");
String temp = "";
for(String tempDepartId : departIdArray) {
temp = temp+",'"+tempDepartId+"'";
}
if(StringUtils.isNotEmpty(temp)) {
temp = temp.substring(1);
}
String tempStartTime = startTime;
String tempEndTime = endTime;
if("month".equals(granularity)) {
baseViewPattern = "%Y-%m";
baseViewGranularity = "MONTH";
tempStartTime = startTime+"-01";
tempEndTime = endTime+"-01";
}
String baseViewName= "(SELECT a.time,b.id as depart_id,b.depart_name FROM (\r\n" +
"SELECT \r\n" +
" DATE_FORMAT(DATE_ADD('"+tempStartTime+"', INTERVAL t.help_topic_id "+baseViewGranularity+"), '"+baseViewPattern+"') AS time\r\n" +
"FROM \r\n" +
" mysql.help_topic t \r\n" +
"WHERE \r\n" +
" t.help_topic_id <= TIMESTAMPDIFF("+baseViewGranularity+", '"+tempStartTime+"', '"+tempEndTime+"')\r\n" +
") a left join (select * from sys_depart where id in("+Arrays.stream(departIds.split(",")).map(id -> "'" + id + "'").collect(Collectors.joining(","))+")) b on 1=1)";
int tag=1;
String sql = "select aa.time,aa.depart_id as departId,aa.depart_name as departName"+selectPart+" from "+baseViewName+" aa ";
for(String tempReportId : reportIdSet) {
String viewName = "view"+tag;
List<String> indexList = reportIndexGroup.get(tempReportId);
sql = sql +"left join "+ReportViewUtil.buildView(tempReportId, String.join(",", indexList), departIds, startTime, endTime) +viewName+ " on aa.time = "+viewName+".time and aa.depart_id = "+viewName+".depart_id ";
tag++;
}
System.out.println("======>>>>"+sql);
return masterDB.queryForList(sql);
}
public static void main(String[] args) {
String ids = "1,2,3,4";
String str = Arrays.stream(ids.split(",")).map(id -> "'" + id + "'").collect(Collectors.joining(","));
System.out.println(str);
}
@Override
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/DrugConsumptionAnalusisServiceImpl.java
package com.skua.modules.equipment.service.impl;
import com.google.common.collect.Maps;
import com.skua.common.constant.ReportConstant;
import com.skua.common.report.ReportViewUtil;
import com.skua.core.context.SpringContextUtils;
import com.skua.core.util.ConvertUtils;
......@@ -29,10 +30,6 @@ import java.util.stream.Collectors;
@Service
public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnalysisService {
String view2119 = "2119ecbf53a1d2d0708258ff67cfd9e1";// 水 COD TP TN NH3H
String view3a24 = "3a243d5715b9e1a3753c180872ca0df9";//能耗报表
private JdbcTemplate getJdbcTemplate(){
JdbcTemplate masterDB = (JdbcTemplate)SpringContextUtils.getBean("master");
return masterDB;
......@@ -64,9 +61,9 @@ public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnaly
displayVO = new DrugConsumptionDisplayVO( CSL, tbqnCsl, tbsyCsl, zyh, hbsyzyh, tbqnzyh);
//历史最低吨水药耗？？？
String dataViewName2119 = ReportViewUtil.buildView(view2119,"CSL", departId, null,null);
String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departId, null,null);
//System.out.println("dataViewName2119 "+dataViewName2119);
String dataViewName3a24 = ReportViewUtil.buildView(view3a24,"PAMZ ,PAMF,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,FESO4G,FESO4Y,H2O2,CH3COOH,SH,FECL3,HXT,PFS,CH3COONA,GXCLJ,YWL,RYXNJ,FHTY", departId, null,null);
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"PAMZ ,PAMF,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,FESO4G,FESO4Y,H2O2,CH3COOH,SH,FECL3,HXT,PFS,CH3COONA,GXCLJ,YWL,RYXNJ,FHTY", departId, null,null);
//System.out.println("dataViewName3a24 "+dataViewName3a24);
StringBuffer sql = new StringBuffer();
sql.append(" select ccc.CSL,ccc.depart_id,ccc.time,ddd.YH ,round(( ddd.YH /ccc.CSL ),2) as 'dsyh' ") ;
......@@ -90,7 +87,7 @@ public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnaly
String startTime=this.getMonthBytime(-25,time)+"-01";
String endTime=this.getMonthBytime(-1,time)+"-31";
String dataViewName3a24 = ReportViewUtil.buildView(view3a24,"PAMZ ,PAMF,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,FESO4G,FESO4Y,H2O2,CH3COOH,SH,FECL3,HXT,PFS,CH3COONA,GXCLJ,YWL,RYXNJ,FHTY", departId, startTime,endTime);
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"PAMZ ,PAMF,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,FESO4G,FESO4Y,H2O2,CH3COOH,SH,FECL3,HXT,PFS,CH3COONA,GXCLJ,YWL,RYXNJ,FHTY", departId, startTime,endTime);
System.out.println("dataViewName3a24 ="+dataViewName3a24);
StringBuffer sql2 = new StringBuffer("select DATE_FORMAT(aaa.time,'%Y-%m') 'time', ");
sql2.append(" round((aaa.PAMZ + aaa.PAMF+ aaa.PAMRJ+ aaa.SCLPAMZ+ aaa.SCLPAMF+ aaa.NACLO+ aaa.PACGT+ aaa.PACYT+ aaa.FESO4G+ aaa.FESO4Y+ aaa.H2O2+ aaa.CH3COOH+ aaa.SH+ aaa.FECL3+ aaa.HXT+ aaa.PFS+ aaa.CH3COONA+ aaa.GXCLJ+ aaa.YWL+ aaa.RYXNJ+ aaa.FHTY),2) 'zyh' from ");
......@@ -133,9 +130,9 @@ public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnaly
String startTime=this.getMonthBytime(-12,time)+"-01";
String endTime=this.getMonthBytime(-1,time)+"-31";
//历史最低吨水药耗？？？
String dataViewName2119 = ReportViewUtil.buildView(view2119,"CSL", departId, startTime,endTime);
String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departId, startTime,endTime);
//System.out.println("dataViewName2119 "+dataViewName2119);
String dataViewName3a24 = ReportViewUtil.buildView(view3a24,"PAMZ ,PAMF,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,FESO4G,FESO4Y,H2O2,CH3COOH,SH,FECL3,HXT,PFS,CH3COONA,GXCLJ,YWL,RYXNJ,FHTY", departId, startTime,endTime);
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"PAMZ ,PAMF,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,FESO4G,FESO4Y,H2O2,CH3COOH,SH,FECL3,HXT,PFS,CH3COONA,GXCLJ,YWL,RYXNJ,FHTY", departId, startTime,endTime);
//System.out.println("dataViewName3a24 "+dataViewName3a24);
StringBuffer sql = new StringBuffer();
sql.append(" select ccc.CSL,ccc.depart_id,ccc.time,ddd.YH ,round((ddd.YH /ccc.CSL ),2) as 'dsyh' ") ;
......@@ -176,7 +173,7 @@ public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnaly
public List<DrugConsumptionDisplayVO> proportionStatistics(String time,String departId){
DateVO dateVO = new DateVO(time);//转换后的时间参数
//本月处理水量
String dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departId, dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
String dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
Double nowMonthCSL = null;//getJdbcTemplate().queryForObject(dataViewName2119,Double.class);
List<Map<String, Object>> dataMapList = getJdbcTemplate().queryForList(dataViewName2119);
if(dataMapList != null ){
......@@ -186,7 +183,7 @@ public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnaly
}
//环比：上月处理水量
dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departId, dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
Double hbsyCsl = null;// getJdbcTemplate().queryForObject(dataViewName2119,Double.class);
dataMapList = getJdbcTemplate().queryForList(dataViewName2119);
if(dataMapList != null ){
......@@ -195,7 +192,7 @@ public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnaly
}
}
//同比处理水量
dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departId, dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
Double tbqnCsl = null;// getJdbcTemplate().queryForObject(dataViewName2119,Double.class);
dataMapList = getJdbcTemplate().queryForList(dataViewName2119);
if(dataMapList != null ){
......@@ -208,13 +205,13 @@ public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnaly
String fileds = "PAMZ,PAMF,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,FESO4G,FESO4Y,H2O2,CH3COOH,SH,FECL3,HXT,PFS,CH3COONA,GXCLJ,YWL,RYXNJ,FHTY";
//本月药剂 总药耗
String dataViewName3a24 = ReportViewUtil.buildViewLike(view3a24,fileds, departId, dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,fileds, departId, dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
Map<String, Object> nowMonthDataMap =queryForMap(dataViewName3a24);// getJdbcTemplate().queryForMap(dataViewName3a24);
//环比：上月药剂 总药耗
dataViewName3a24 = ReportViewUtil.buildViewLike(view3a24,fileds, departId, dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,fileds, departId, dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
Map<String, Object> lastMonthDataMap = queryForMap(dataViewName3a24);//getJdbcTemplate().queryForMap(dataViewName3a24);
//同比：去年本月药剂： 总药耗
dataViewName3a24 = ReportViewUtil.buildViewLike(view3a24,fileds, departId, dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,fileds, departId, dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
Map<String, Object> lastYearMonthDataMap = queryForMap(dataViewName3a24);//getJdbcTemplate().queryForMap(dataViewName3a24);
String filedsSql = "select item_code ,item_alias from f_report_item where item_code in ('PAMZ','PAMF','PAMRJ','SCLPAMZ','SCLPAMF','NACLO','PACGT','PACYT','FESO4G','FESO4Y','H2O2','CH3COOH','SH','FECL3','HXT','PFS','CH3COONA','GXCLJ','YWL','RYXNJ','FHTY') ";
......@@ -268,8 +265,8 @@ public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnaly
String startTime=this.getMonthBytime(-12,time)+"-01";
String endTime=this.getMonthBytime(-1,time)+"-31";
//本月处理水量
String dataViewName2119 = ReportViewUtil.buildView(view2119,"JSSS", departId, startTime,endTime);
String dataViewName3a24 = ReportViewUtil.buildView(view3a24,"WNL,WNHSL,"+drugCode, departId, startTime,endTime);
String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"JSSS", departId, startTime,endTime);
String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24,"WNL,WNHSL,"+drugCode, departId, startTime,endTime);
String sql = " select DATE_FORMAT(aaa.time,'%Y-%m') 'time',aaa.JSSS ,aaa.depart_id from " +dataViewName2119+" aaa group by DATE_FORMAT(aaa.time,'%Y-%m') " ;
List<Map<String, Object>> dataList = getJdbcTemplate().queryForList(sql);
if(dataList != null){
......@@ -315,7 +312,7 @@ public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnaly
* @return
*/
private Double countDSYH(String departId ,String startTime ,String endTime ){
String dataViewName3a24 = ReportViewUtil.buildViewLike(view3a24,"PAMZ ,PAMF,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,FESO4G,FESO4Y,H2O2,CH3COOH,SH,FECL3,HXT,PFS,CH3COONA,GXCLJ,YWL,RYXNJ,FHTY", departId, startTime,endTime);
String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"PAMZ ,PAMF,PAMRJ,SCLPAMZ,SCLPAMF,NACLO,PACGT,PACYT,FESO4G,FESO4Y,H2O2,CH3COOH,SH,FECL3,HXT,PFS,CH3COONA,GXCLJ,YWL,RYXNJ,FHTY", departId, startTime,endTime);
StringBuffer sql2 = new StringBuffer("select ");
sql2.append(" round((aaa.PAMZ + aaa.PAMF+ aaa.PAMRJ+ aaa.SCLPAMZ+ aaa.SCLPAMF+ aaa.NACLO+ aaa.PACGT+ aaa.PACYT+ aaa.FESO4G+ aaa.FESO4Y+ aaa.H2O2+ aaa.CH3COOH+ aaa.SH+ aaa.FECL3+ aaa.HXT+ aaa.PFS+ aaa.CH3COONA+ aaa.GXCLJ+ aaa.YWL+ aaa.RYXNJ+ aaa.FHTY),2) 'YH' from ");
sql2.append( " "+dataViewName3a24+" aaa ");
......@@ -330,7 +327,7 @@ public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnaly
}
private Double getCSL(String departId ,String startTime ,String endTime ){
String dataViewName2119 = ReportViewUtil.buildViewLike(view2119,"CSL", departId, startTime,endTime);
String dataViewName2119 = ReportViewUtil.buildViewLike(ReportConstant.view2119,"CSL", departId, startTime,endTime);
List<Map<String, Object>> mapList = getJdbcTemplate().queryForList(dataViewName2119);
String csl = null;
for(Map<String,Object> map : mapList ){
......
sk-module-system/src/main/java/com/skua/config/ShiroConfig.java
......@@ -46,6 +46,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/sys/login", "anon"); //登录接口排除
filterChainDefinitionMap.put("/sys/appLogin", "anon"); //移动端登录接口排除
filterChainDefinitionMap.put("/sys/thirdLogin", "anon"); //三方系统登录接口排除
filterChainDefinitionMap.put("/sys/sso/login", "anon"); //单点登录接口排除
filterChainDefinitionMap.put("/sys/logout", "anon"); //登出接口排除
filterChainDefinitionMap.put("/sys/getEncryptedString", "anon"); //获取加密串
filterChainDefinitionMap.put("/sys/sms", "anon");//短信验证码
......@@ -64,7 +65,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/web/erp/materialAcceptanceForm/senderSign", "anon");//采购入库,送货方签名
filterChainDefinitionMap.put("/web/erp/materialIN/queryById", "anon");//采购入库,查询采购入库信息
filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件
filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件
filterChainDefinitionMap.put("/web/process/getProcessByPhone", "anon");//第三方获取待办事件
filterChainDefinitionMap.put("/", "anon");
filterChainDefinitionMap.put("/doc.html", "anon");
filterChainDefinitionMap.put("/**/*.js", "anon");
......@@ -142,7 +143,7 @@ public class ShiroConfig {
// 压测demo
filterChainDefinitionMap.put("/jmeter/**", "anon");
filterChainDefinitionMap.put("/jmReport/**", "anon");
filterChainDefinitionMap.put("/v1/factoryCenter/**", "anon");
filterChainDefinitionMap.put("/v1/operate/**", "anon");
//哈工大报表填报数据
filterChainDefinitionMap.put("/harbinTechnology/fillReport/**", "anon"); //哈工大报表填报数据
......
sk-module-system/src/main/java/com/skua/modules/system/controller/LoginController.java
......@@ -11,6 +11,8 @@ import java.util.Objects;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.skua.core.util.encryption.MD5Util;
import com.skua.modules.system.vo.SsoLogin;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -184,6 +186,39 @@ public class LoginController {
return result;
}
/**
* 单点登录接口
* @param ssoLogin
* @return
*/
@RequestMapping(value = "/sso/login", method = RequestMethod.POST)
@ApiOperation("单点登录接口")
public Result<JSONObject> ssoLogin(@RequestBody SsoLogin ssoLogin){
Result<JSONObject> result = new Result<JSONObject>();
String phone = ssoLogin.getPhone();//手机号
String time = ssoLogin.getTime();//时间戳
String sign = ssoLogin.getSign();//加密信息
String key = "szhqydn";//约定标识
SysUser sysUser = sysUserService.getUserByPhone(ssoLogin.getPhone());
if(sysUser!=null){
String origin = key + time + phone;//标识
String md5 = MD5Util.MD5Encode(origin, null);
if(sign.equals(md5)){
//校验用户是否有效
result = sysUserService.checkUserIsEffective(sysUser);
if (!result.isSuccess()) {
return result;
}
//用户登录信息
userInfo(sysUser, result);
sysBaseAPI.addLog("手机号: " + phone + ",单点登录成功！", CommonConstant.LOG_TYPE_1, null);
}
}else{
result.error500("手机号不存在本系统");
}
return result;
}
@RequestMapping(value = "/getSv30Token", method = RequestMethod.POST)
@ApiOperation("SV30获取token")
public Result<JSONObject> getSv30Token(){
......
sk-module-system/src/main/java/com/skua/modules/system/vo/SsoLogin.java 0 → 100644
package com.skua.modules.system.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 单点登陆参数
*/
@Data
@ApiModel(value="SsoLogin", description="单点登陆参数")
public class SsoLogin {
@ApiModelProperty(value = "手机号")
private String phone;
@ApiModelProperty(value = "时间戳")
private String time;
@ApiModelProperty(value = "加密信息")
private String sign;
@ApiModelProperty(value = "约定标识")
private String key;
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!