Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
d38a79b3 由 张雷
选项

禅道BUG修改

1 个父辈 aea92358
全部展开
内嵌 并排
正在显示 17 个修改的文件 包含 315 行增加 和 62 行删除
sk-module-biz/src/main/java/com/skua/modules/threedimensional/controller/ScreenDataController.java
......@@ -651,18 +651,17 @@ public class ScreenDataController {
@AutoLog(value = "厂区详细信息-厂区信息自定义查询")
@ApiOperation(value = "厂区详细信息-厂区信息自定义查询", notes = "厂区详细信息-厂区信息自定义查询")
@RequestMapping(value = "/getFactoryListByWrapper", method = RequestMethod.GET)
public Result<List<SysFactoryInfoVO>> getFactoryListByWrapper(SysFactoryInfoVO
sysFactoryInfoVO, HttpServletRequest request) {
public Result<List<SysFactoryInfoVO>> getFactoryListByWrapper(SysFactoryInfoVO sysFactoryInfoVO) {
Result<List<SysFactoryInfoVO>> result = new Result<>();
QueryWrapper<SysFactoryInfoVO> queryWrapper = new QueryWrapper<>();
String departType = sysFactoryInfoVO.getDepartType();
if (org.apache.commons.lang3.StringUtils.isNotBlank(departType)) {
if (ConvertUtils.isNotEmpty(departType)) {
queryWrapper.in("d.depart_type", departType.split(","));
}
String dataDepartId = sysFactoryInfoVO.getDepartId();
if (org.apache.commons.lang3.StringUtils.isNotBlank(dataDepartId)) {
if (ConvertUtils.isNotEmpty(dataDepartId)) {
queryWrapper.in("d.id", dataDepartId.split(","));
}
queryWrapper.orderByAsc("d.depart_order");
......
sk-module-biz/src/main/resources/application.yml
spring:
profiles:
active: test
active: dev
# 信息安全
security:
csrf:
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/FCustomReportDatasetMapper.java
......@@ -3,6 +3,7 @@ package com.skua.modules.custom.mapper;
import java.util.List;
import java.util.Map;
import com.skua.modules.custom.vo.DepartWeekReportVO;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.custom.entity.FCustomReportDataset;
......@@ -82,4 +83,9 @@ public interface FCustomReportDatasetMapper extends BaseMapper<FCustomReportData
List<Map<String, Object>> getDataFromHY(@Param(value="tbYear")String tbYear, @Param(value="year")String year,
@Param(value="departId")String departId);
Map<String, Object> getWeekReport(@Param(value="dataTime") String dataTime, @Param(value="departId") String departId,
@Param(value="week") String week,@Param(value="startDate") String startDate,@Param(value="endDate") String endDate);
List<DepartWeekReportVO> getWeekReportData(@Param(value="startDate") String startDate, @Param(value="endDate") String endDate);
}
......
sk-module-datafill/src/main/java/com/skua/modules/custom/mapper/xml/FCustomReportDatasetMapper.xml
......@@ -172,4 +172,75 @@
where v1.time like CONCAT(#{year},'%') and v1.depart_id = #{departId} GROUP BY v1.depart_id,left(v1.time,7)
</select>
<select id="getWeekReport" resultType="java.util.HashMap">
SELECT
d.id AS depart_id,
#{week} as zs,
#{dataTime} as time,
'2024-06-01' as startdate,
'2024-06-07' as enddate,
v9.JSCOD as jscod,
v9.JSAD as jsnh3n,
v9.JSPH as jsph,
v9.JSZD as jstn,
v9.JSZL as jstp,
v9.CSCOD as cscod,
v9.CSAD as csnh3n,
v9.CSPH as csph,
v9.CSTN as cstn,
v9.CSZL as cstp,
v3.qt5,v3.qt4,v3.qt3,v3.qt2,v3.qt1,
v3.scqk5,v3.scqk4,v3.scqk3,v3.scqk2,v3.scqk1,
v3.id,v3.zwncb,v3.tnlgyy,v3.sjtnl,
v3.lltnl,v3.wnndgyy,v3.zsjwnnd,v3.llwnnd,v3.yjyy,v3.dhyy,
v8.dlhj,v8.yjhl,v8.wnl,
v2.zclsl,v2.rjclsl
FROM
sys_depart d
LEFT JOIN (SELECT * FROM view_30a8 WHERE depart_id = #{departId} AND time = #{dataTime} AND zs = #{week}) v3 on v3.depart_id = d.id
LEFT JOIN (SELECT
ROUND(AVG(JSCOD),2) JSCOD,ROUND(AVG(JSAD),2) JSAD,ROUND(AVG(JSPH),2) JSPH,ROUND(AVG(JSZD),2) JSZD,ROUND(AVG(JSZL),2) JSZL,
ROUND(AVG(CSCOD),2) CSCOD,ROUND(AVG(CSAD),2) CSAD,ROUND(AVG(CSPH),2) CSPH,ROUND(AVG(CSTN),2) CSTN,ROUND(AVG(CSZL),2) CSZL,
depart_id
FROM view_9bff
WHERE depart_id = #{departId} AND time &gt;= #{startDate} AND time &lt;= #{endDate} ) v9 on v9.depart_id = d.id
LEFT JOIN (SELECT
SUM(DLHJ) dlhj,(SUM( PAMRJ ) + SUM( SCLPAMZ ) + SUM( SCLPAMF ) + SUM( NACLO ) + SUM( PACGT ) + SUM( PACYT ) + SUM( PFS ) + SUM( FHTY ) +
SUM( RYXNJ ) + SUM( YWL ) + SUM( GXCLJ ) + SUM( CH3COONA ) + SUM( HXT ) + SUM( FECL3 ) + SUM( SH ) + SUM( CH3COOH ) + SUM( FESO4G ) +
SUM( FESO4Y ) + SUM( H2O2 )) yjhl,SUM(WNL) wnl,depart_id
FROM view_3a24
WHERE depart_id = #{departId} AND time &gt;= #{startDate} AND time &lt;= #{endDate} ) v8 on v8.depart_id = d.id
LEFT JOIN (SELECT
SUM(CSL) zclsl,
ROUND(AVG(CSL),2) rjclsl,
depart_id
FROM view_2119
WHERE depart_id = #{departId} AND time &gt;= #{startDate} AND time &lt;= #{endDate} ) v2 on v2.depart_id = d.id
WHERE
d.id = #{departId}
</select>
<select id="getWeekReportData" resultType="com.skua.modules.custom.vo.DepartWeekReportVO">
SELECT
d.depart_order AS num,
d.depart_name,
f.pro_scale AS sjsl,
v2.rjclsl AS clsl,
v3.wnl AS wnl,
ROUND(v3.hdl/v2.zclsl,4) AS dsdh
FROM
sys_depart d
left join sys_factory_info f on f.depart_id = d.id
left join (select depart_id,ROUND(SUM(WNL),2) wnl,ROUND(SUM(DLHJ),2) hdl
from view_3a24
where time &gt;= #{startDate} AND time &lt;= #{endDate} GROUP BY depart_id) v3 on v3.depart_id = d.id
left join (select depart_id, ROUND(AVG(CSL)/10000,2) AS rjclsl, ROUND(SUM(CSL),2) AS zclsl
from view_2119
where time &gt;= #{startDate} AND time &lt;= #{endDate} GROUP BY depart_id) v2 on v2.depart_id = d.id
WHERE
d.depart_type = 1
ORDER BY
d.depart_order
</select>
</mapper>
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/IFCustomReportDatasetService.java
......@@ -81,4 +81,14 @@ public interface IFCustomReportDatasetService extends IService<FCustomReportData
* @return
*/
List<Map<String, Object>> getDataFromHY(String dataTime, String departId);
/**
* 运营周报
* @param dataTime
* @param departId
* @return
*/
Map<String, Object> getWeekReport(String dataTime, String departId, String week);
Map<String, Object> reportWeekShow(String dataTime, String week);
}
......
sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
......@@ -4,11 +4,14 @@ import com.skua.common.report.ReportViewUtil;
import com.skua.modules.custom.entity.FCustomReportDataset;
import com.skua.modules.custom.mapper.FCustomReportDatasetMapper;
import com.skua.modules.custom.service.IFCustomReportDatasetService;
import com.skua.modules.custom.vo.DepartWeekReportVO;
import com.skua.modules.custom.vo.FCustomReportDatasetVO;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.time.temporal.WeekFields;
import java.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -71,4 +74,76 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
return valueMapList;
}
@Override
public Map<String, Object> getWeekReport(String dataTime, String departId, String week) {
Map<String, Object> valueMap = new HashMap<>();
Map<String,String> weekMap = getWeekDate(dataTime,week);
String startDate = weekMap.get("start");
String endDate = weekMap.get("end");
valueMap = mapper.getWeekReport(dataTime, departId, week, startDate, endDate);
if(valueMap==null){
valueMap = new HashMap<>();
valueMap.put("depart_id", departId);
valueMap.put("time", dataTime);
valueMap.put("zs", week);
valueMap.put("startdate", startDate);
valueMap.put("enddate", endDate);
}
return valueMap;
}
/**
* 获取周开始结束时间
* @param yearMonth
* @param week
* @return
*/
public static Map<String,String> getWeekDate(String yearMonth,String week) {
Map<String,String> map = new HashMap<>();
int weekOfMonth = Integer.valueOf(week); // 输入的第几周
try {
// 解析年月并构造本月的第一天日期
LocalDate firstOfMonth = LocalDate.parse(yearMonth + "-01", DateTimeFormatter.ofPattern("yyyy-MM-dd"));
// 获取本月的第一个星期一
WeekFields weekFields = WeekFields.of(Locale.getDefault());
LocalDate firstMondayOfMonth = firstOfMonth.with(TemporalAdjusters.firstInMonth(weekFields.getFirstDayOfWeek()));
// 计算目标周的开始和结束日期
LocalDate startOfWeek = firstMondayOfMonth.plusWeeks(weekOfMonth - 1).plusDays(1);
LocalDate endOfWeek = startOfWeek.plusDays(6);
// 如果结束日期超出本月，调整结束日期
if (endOfWeek.getMonth() != firstOfMonth.getMonth()) {
endOfWeek = firstOfMonth.withDayOfMonth(firstOfMonth.lengthOfMonth());
}
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
map.put("start", startOfWeek.format(dateFormatter));
map.put("end", endOfWeek.format(dateFormatter));
} catch (Exception e) {
map.put("start", "");
map.put("end", "");
}
return map;
}
@Override
public Map<String, Object> reportWeekShow(String dataTime, String week) {
Map<String, Object> map = new HashMap<>();
List<DepartWeekReportVO> list = new ArrayList<>();
Map<String,String> weekMap = getWeekDate(dataTime,week);
String startDate = weekMap.get("start");
String endDate = weekMap.get("end");
list = mapper.getWeekReportData(startDate, endDate);
map.put("zclsl", "776");//处理水量合计
map.put("rjclsl", "110.7");//日均处理水量
map.put("rjclsl_hb", "2");//较上周增减量
map.put("dsdh", "0.329");//吨水电耗
map.put("dsdh_hb", "0.002");//吨水电耗较上周增减量
map.put("cnl", "3978.8");//产泥量
map.put("list", list);
map.put("scqk", "（1）本周暂无生产情况说明");//生产情况
map.put("wxqk", "（1）本周暂无设备大修、更新情况");//
map.put("aqgz", "（1）本周暂无生产情况说明");//安全工作
map.put("qt", "（1）本周暂无其他情况说明");//其他
return map;
}
}
......
sk-module-datafill/src/main/java/com/skua/modules/custom/vo/DepartWeekReportVO.java 0 → 100644
package com.skua.modules.custom.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 周运行统计VO对象
*/
@Data
@ApiModel(value="周运行统计VO对象", description="周运行统计VO对象")
public class DepartWeekReportVO {
/**编号*/
@ApiModelProperty(value = "编号")
private String num;
/**厂区名称*/
@ApiModelProperty(value = "厂区名称")
private String departName;
/**设计规模*/
@ApiModelProperty(value = "设计规模")
private String sjsl;
/**实际水量*/
@ApiModelProperty(value = "实际水量")
private String clsl;
/**污泥量*/
@ApiModelProperty(value = "污泥量")
private String wnl;
/**吨水电耗*/
@ApiModelProperty(value = "吨水电耗")
private String dsdh;
}
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/FactoryCenterMapper.java
package com.skua.modules.dataAnalysis.mapper;
import com.skua.modules.system.datestandard.entity.SysMonitorMetricInfo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface FactoryCenterMapper {
List<SysMonitorMetricInfo> getMonitorListByDepart(@Param("departId") String departId);
List<Map<String, Object>> getHourWaterData(@Param("departId") String departId, @Param("startDate") String startDate, @Param("endDate") String endDate);
}
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/mapper/xml/FactoryCenterMapper.xml
......@@ -2,17 +2,4 @@
<!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="getMonitorListByDepart" resultType="com.skua.modules.system.datestandard.entity.SysMonitorMetricInfo">
SELECT
*
FROM
sys_monitor_metric_info
WHERE
depart_id = #{departId}
AND metric_uid_tag IN ( 'JSTP', 'JSTN', 'JSPH', 'JSNH3N', 'JSCOD', 'CSTP', 'CSTN', 'CSPH', 'CSNH3N', 'CSCOD' )
</select>
<select id="getHourWaterData" resultType="java.util.HashMap">
select * from sys_monitor_metric_info
</select>
</mapper>
......
sk-module-datafill/src/main/java/com/skua/modules/report/controller/ReportDataController.java
......@@ -112,4 +112,58 @@ public class ReportDataController {
return Result.ok(valueMapList);
}
/**
* 功能描述: 运营周报
* @Author: zhanglei
* @Date: 2022/1/19 17:57
*/
@AutoLog(value = "运营周报展示")
@ApiOperation(value = "运营周报展示", notes = "运营周报展示")
@GetMapping(value = "/reportWeekData")
public Result reportWeekData(HttpServletRequest req) {
String departId = ConvertUtils.getString(req.getParameter("departId"));
String reportId = ConvertUtils.getString(req.getParameter("reportId"));
String dataTime = ConvertUtils.getString(req.getParameter("time"));
String week = ConvertUtils.getString(req.getParameter("week"));
Map<String, Object> valueMap = new HashMap<>();
valueMap = fCustomReportDatasetService.getWeekReport(dataTime, departId, week);
Map<String, Map<String, Object>> time2Val = Maps.newHashMap();
Map<String, Object> tmp = Maps.newHashMap();
valueMap.forEach((key, val) -> {
if (val != null) {
double v = 0;
try {
v = Double.parseDouble(val.toString());
if (StringUtils.isNotBlank(val.toString())) {
String bigDecimal = new BigDecimal(v).setScale(2, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
tmp.put(key, bigDecimal);
} else {
tmp.put(key, val);
}
} catch (NumberFormatException e) {
tmp.put(key, val);
}
} else {
tmp.put(key, val);
}
});
String time = ConvertUtils.getString(valueMap.get("time"));
tmp.put("departId", ConvertUtils.getString(valueMap.get("depart_id")));
tmp.put("reportId", reportId);
time2Val.put(time, tmp);
return Result.ok(valueMap);
}
@AutoLog(value = "运营周报展示")
@ApiOperation(value = "运营周报展示", notes = "运营周报展示")
@GetMapping(value = "/reportWeekShow")
public Result<Map<String,Object>> reportWeekShow(HttpServletRequest req) {
Result<Map<String,Object>> result = new Result<>();
String dataTime = ConvertUtils.getString(req.getParameter("time"));
String week = ConvertUtils.getString(req.getParameter("week"));
Map<String,Object> map = fCustomReportDatasetService.reportWeekShow(dataTime,week);
result.setResult(map);
return result;
}
}
......
sk-module-datafill/src/main/java/com/skua/modules/report/controller/ReportShowController.java
......@@ -100,7 +100,7 @@ public class ReportShowController {
long start = DateUtils.getMillis();
if(StringUtils.isEmpty(departId)) {
departId = BaseContextHandler.getDeparts();
}
}
List<Map<String,Object>> resultList = new ArrayList<>();
List<Map<String,Object>> dataList = new ArrayList<>();
List<FReportItem> attributeList = new ArrayList<>();
......@@ -134,7 +134,7 @@ public class ReportShowController {
// FReportItem fReportItem = itemList.get(j);
// if(fReportItem!=null){
// attributeList.add(fReportItem);
//
//
// }
// }
//System.out.println("获取组装SQL时间"+ (DateUtils.getMillis()-start));
......@@ -149,7 +149,7 @@ public class ReportShowController {
//sql.append(" from view_"+reportId.substring(0,4)+" v ");
//System.out.println(ReportViewUtil.buildView(reportId, "", departId, "", ""));
sql.append(" from "+ReportViewUtil.buildViewLike(reportId, itemCodes, departId, dataTime)+" v ");
//sql.append(" left join view_audit_info d on v.id=d.report_content_id ");
sql.append(" left join sys_depart s on s.id = v.depart_id ");
sql.append(" where 1=1 ");
......@@ -200,7 +200,7 @@ public class ReportShowController {
// dataList.add(dataMap);
// }
// }else{
//
//
// }
}
}
......@@ -226,20 +226,20 @@ public class ReportShowController {
Result<List<String>> result = new Result<List<String>>();
List<String> dataList = new ArrayList<String>();
JdbcTemplate masterDB = (JdbcTemplate)SpringContextUtils.getBean("master");
String tableName = ReportViewUtil.buildView(reportId, "", departId, startTime, endTime);
//String tableName = "view_"+reportId.substring(0,4);
String sql="select time from "+tableName+" a where depart_id=? and time >=? and time <=?";
List<Map<String, Object>> list = masterDB.queryForList(sql,departId,startTime,endTime);
for(Map<String,Object> map : list) {
dataList.add(ConvertUtils.getString(map.get("time")));
}
}
result.setResult(dataList);
result.success("成功");
return result;
}
private Map<String, Object> getNewMap(Map<String, Object> oldMap, List<FReportItem> attributeList) {
Map<String,Object> newMap = new LinkedHashMap<>();
......@@ -450,7 +450,7 @@ public class ReportShowController {
String orgCode = BaseContextHandler.getOrgCode();
//获取填报时间年份,2020年及以前的数据存储到历史表，2020年之后的存储到新表，分表情况为洪城项目特有，其他项目请删除此逻辑
int year = Integer.valueOf(dataTime.substring(0, 4));
if(jsonObject.size() > 2){
Iterator entries = map.entrySet().iterator();
while (entries.hasNext()) {
......@@ -532,20 +532,20 @@ public class ReportShowController {
}else {
itemvList = fReportHistoryItemvService.getReportItemvByDataId(dataId);
}
//构造itemvMap便于后面存储数据
Map<String,FReportItemv> itemvMap = new HashMap<String,FReportItemv>();
for(FReportItemv f : itemvList) {
itemvMap.put(f.getReitId(), f);
}
//更新itemvList数据
if(jsonObject.size() > 3){
Iterator entries = map.entrySet().iterator();
//接收所有填报字段
String keys="";
Map<String,Object> formMap = new HashMap<String,Object>();
while (entries.hasNext()) {
Map.Entry entry = (Map.Entry) entries.next();
String key = entry.getKey().toString();
......@@ -632,7 +632,7 @@ public class ReportShowController {
//fReportHistoryItemvService.saveOrUpdateBatch(historyItemvList);
System.out.println("结束");
}
//触发自定义处理逻辑
FReportManage fReportManage = fReportManageService.getById(reportId);
String customService = fReportManage.getCustomService();
......@@ -640,13 +640,13 @@ public class ReportShowController {
ICustomHandle customHandle = (ICustomHandle)SpringContextUtils.getBean(customService);
customHandle.CustomService(jsonObject);
}
result.setSuccess(true);
result.setMessage("修改成功");
}else{
result.setMessage("修改失败");
}
// if(jsonObject.size() > 3){
// Iterator entries = map.entrySet().iterator();
// while (entries.hasNext()) {
......@@ -752,13 +752,21 @@ public class ReportShowController {
@ApiOperation(value="报表数据项值-判断日期是否存在", notes="报表数据项值-判断日期是否存在")
@GetMapping(value = "/isExitData")
public Result<Map<String,Object>> isExitData(@RequestParam(name="time",required=true) String time,
@RequestParam(name="reportId",required=true) String reportId,
@RequestParam(name="departId",required=true) String departId) {
@RequestParam(name="reportId",required=true) String reportId,
@RequestParam(name="departId",required=true) String departId,String week) {
Result<Map<String,Object>> result = new Result<Map<String,Object>>();
Map<String,Object> map = new HashMap<>();
boolean ok = true;
try {
ok = fReportItemvService.isExitDataByTime(reportId,time,departId);
if("30a80f54ff288ede9d2df2ddd073b6c3".equals(reportId)){
if(ConvertUtils.isEmpty(week)){
map.put("flag",false);
return result;
}
ok = fReportItemvService.isExitDataByTimeAndWeek(reportId,time,departId,week);
}else{
ok = fReportItemvService.isExitDataByTime(reportId,time,departId);
}
} catch (Exception e) {
ok = false;
}
......@@ -788,7 +796,7 @@ public class ReportShowController {
try {
//获取权限
List<FPermissionCfgDetail> allList = getPermissionByUser(userName, reportId);
//组装SQL
StringBuffer sql = new StringBuffer("select ");
String itemInSqlPart = "";
......@@ -797,7 +805,7 @@ public class ReportShowController {
}
attributeList = fReportItemService.getItemInfoSql(itemInSqlPart, reportId);
Collections.sort(attributeList);
String itemCodes = "";
for (int m = 0; m < attributeList.size(); m++) {
if(!"InputGroup".equals(attributeList.get(m).getTextType())) {
......@@ -811,7 +819,7 @@ public class ReportShowController {
sql.append(" v.depart_id as departId,s.depart_name as departName,v.id,v.time,'' as auditState,'' as nodeValue," +
"'' as recordMsg,'' as opeId ");
//sql.append(" from view_"+reportId.substring(0,4)+" v ");
sql.append(" from "+ReportViewUtil.buildView(reportId, itemCodes, departId, "", "")+" v ");
//sql.append(" left join view_audit_info d on v.id=d.report_content_id ");
sql.append(" left join sys_depart s on s.id = v.depart_id ");
......@@ -831,19 +839,19 @@ public class ReportShowController {
sql.append(" and v.depart_id in ("+factoryInSql+") ");
}
sql.append(" order by v.time desc ");
// if(StringUtils.isNotEmpty(departId)){
// sql.append(" and v.depart_id = '"+departId+"' ");
// }
// sql.append(" order by v.time desc ");
log.info("===================:"+sql.toString());
resultList = fReportManageService.getReportBySql(sql.toString());
//洪城项目用户要求运营日报导出带出各药剂项及药量
if(reportId.equals("b78f82e1d9d01016ad72517dc430c3b5")) {
fReportManageService.handleYyrbResult(reportId,attributeList,resultList);
}
List<Map<String,Object>> newResultList = new LinkedList<>();
for (int x = 0; x < resultList.size(); x++) {
Map<String,Object> dataMap = getNewMap(resultList.get(x),attributeList);
......@@ -881,7 +889,7 @@ public class ReportShowController {
}
}
}
for (int m = 0; m < attributeList.size(); m++) {
if(!"InputGroup".equals(attributeList.get(m).getTextType())) {
if(!StringUtils.isEmpty(attributeList.get(m).getUnit())) {
......@@ -1060,7 +1068,7 @@ public class ReportShowController {
result.setSuccess(true);
return result;
}
public static void main(String[] args) {
String time = "2022-01-02";
System.out.println(time.substring(0, 4));
......
sk-module-datafill/src/main/java/com/skua/modules/report/service/IFReportItemvService.java
......@@ -33,4 +33,5 @@ public interface IFReportItemvService extends IService<FReportItemv> {
List<FReportItemv> getReportItemvByReitId(ReportItemvParam reportItemvParam);
boolean isExitDataByTimeAndWeek(String reportId, String time, String departId, String week);
}
......
sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/FReportItemvServiceImpl.java
......@@ -87,7 +87,18 @@ public class FReportItemvServiceImpl extends ServiceImpl<FReportItemvMapper, FRe
return fReportItemvMapper.getReportItemvByReitId(reportItemvParam);
}
@Override
public boolean isExitDataByTimeAndWeek(String reportId, String dataTime, String departId, String week) {
List<Map<String,Object>> list = new ArrayList<>();
String tableName = ReportViewUtil.buildView(reportId,"",departId,dataTime,dataTime);
String sql = "select * from "+tableName+" aa where time = '"+dataTime+"' and depart_id = '"+departId+"' and zs = '"+week+"'";
list = fReportItemvMapper.getListByTime(sql);
if(list.size()>0){
return false;
}else{
return true;
}
}
}
......
sk-module-system/src/main/java/com/skua/config/ShiroConfig.java
......@@ -136,6 +136,7 @@ public class ShiroConfig {
// 压测demo
filterChainDefinitionMap.put("/jmeter/**", "anon");
filterChainDefinitionMap.put("/jmReport/**", "anon");
filterChainDefinitionMap.put("/v1/factoryCenter/**", "anon");
//哈工大报表填报数据
filterChainDefinitionMap.put("/harbinTechnology/fillReport/**", "anon"); //哈工大报表填报数据
......
sk-module-system/src/main/java/com/skua/modules/system/mapper/SysFactoryInfoMapper.java
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.alarmtmp.entity.AlarmParamStandardConfig;
import com.skua.modules.system.vo.SysFactoryInfo.*;
......@@ -67,7 +68,6 @@ public interface SysFactoryInfoMapper extends BaseMapper<SysFactoryInfo> {
*/
List<SysFactoryInfoVO> queryFactoryListByExport(@Param("departIds")String departIds);
void updFacStatus(@Param("lineStatus") Integer lineStatus, @Param("departId") String departId, @Param("endTime") String endTime);
List<Map<String, Object>> getAllFacListStatus();
......@@ -88,8 +88,11 @@ public interface SysFactoryInfoMapper extends BaseMapper<SysFactoryInfo> {
List<Map<String, Object>> queryUpLow(@Param("id") String id);
@Select("SELECT d.id as depart_id, d.depart_name AS NAME,d.depart_name AS depart_name,d.depart_type,(select depart_name from sys_depart sd where d.parent_id = sd.id )areaName,f.* FROM sys_depart d LEFT JOIN sys_factory_info f ON f.depart_id = d.id ${customSqlSegment}")
List<SysFactoryInfoVO> getFactoryListByWrapper(QueryWrapper queryWrapper);
@Select("SELECT d.id as depart_id, d.depart_name AS name,d.depart_name AS depart_name,d.depart_type," +
"(select depart_name from sys_depart sd where d.parent_id = sd.id ) areaName,f.* " +
"FROM sys_depart d " +
"LEFT JOIN sys_factory_info f ON f.depart_id = d.id ${ew.customSqlSegment}")
List<SysFactoryInfoVO> getFactoryListByWrapper(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
/**
* 获取总的设计规模
......
sk-module-system/src/main/java/com/skua/modules/system/vo/SysFactoryInfo/SysFactoryInfoVO.java
......@@ -65,7 +65,8 @@ public class SysFactoryInfoVO {
private String proImgs;
@ApiModelProperty(value = "水厂介绍")
private String factoryInfo;
@ApiModelProperty(value = "厂站工艺主图")
private String proMonitorMainImg;
/**
* 水厂类型
*/
......@@ -102,7 +103,7 @@ public class SysFactoryInfoVO {
*/
@ApiModelProperty(value = "执行排放标准")
private String outLevel;
@ApiModelProperty(value = "执行进水标准")
private String inLevel;
/**
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!