Skip to content

张雷 / skboot-zhongye

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

Merge remote-tracking branch 'origin/master'

2 个父辈 1c291b0e 7e31164f
全部展开
内嵌 并排
正在显示 37 个修改的文件 包含 341 行增加 和 160 行删除
sk-base-common/src/main/java/com/skua/modules/system/service/impl/PgServiceImpl.java
......@@ -194,8 +194,8 @@ public class PgServiceImpl implements IPgService {
}
}
str.append("''");
String sql = "SELECT nm,v FROM "+deviceId+"_count WHERE nm IN ( "+str.toString()+" ) " +
" AND ts = ( SELECT max( ts ) FROM "+deviceId+"_count WHERE ts >= '"+start+"' AND ts <= '"+end+"' )";
String sql = "SELECT nm,ROUND(AVG(CAST(v AS NUMERIC)),2) AS v FROM "+deviceId+"_count WHERE nm IN ( "+str.toString()+" ) " +
" AND ts >= '"+start+"' AND ts <= '"+end+"' GROUP BY nm";
list = pgDb.queryForList(sql);
}catch (Exception e){
log.error("查询计算表出错");
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingController.java
......@@ -67,7 +67,6 @@ public class AjhMeetingController {
* @author 开发者姓名, 开发时间
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
@AutoLog(value = "会议通知-分页列表查询")
@ApiOperation(value="会议通知-分页列表查询", notes="会议通知-分页列表查询")
@GetMapping(value = "/list")
......@@ -83,6 +82,28 @@ public class AjhMeetingController {
return result;
}
@AutoLog(value = "会议通知-撤回")
@ApiOperation(value="会议通知-撤回", notes="会议通知-撤回")
@GetMapping(value = "/revoke")
public Result<AjhMeeting> revokeRecord(String id) {
Result<AjhMeeting> result = new Result<AjhMeeting>();
boolean ok = false;
AjhMeeting ajhMeeting = ajhMeetingService.getById(id);
if(ConvertUtils.isNotEmpty(ajhMeeting)){
ok = ajhMeetingService.revoke(ajhMeeting);
if(ok){
result.success("撤回成功！");
}else{
result.error500("撤回失败！已有机构发布通知！");
}
}else{
result.error500("撤回失败！通知不存在！");
}
result.setSuccess(ok);
result.setResult(ajhMeeting);
return result;
}
/**
* <pre>
* 添加
......@@ -119,8 +140,8 @@ public class AjhMeetingController {
@PostMapping(value = "/release")
public Result<AjhMeeting> release(@RequestBody AjhMeeting ajhMeeting) {
Result<AjhMeeting> result = new Result<AjhMeeting>();
try {
boolean ok = false;
try {
ajhMeeting.setSender(BaseContextHandler.getUserId());
ajhMeeting.setSendTime(new Date());
ajhMeeting.setSendStatus("1");//状态修改为已发布
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingSendController.java
......@@ -349,12 +349,15 @@ public class AjhMeetingSendController {
if(ajhMeetingSend != null ){
if(StringUtils.isNotEmpty(ajhMeetingSend.getMeetCompere())){
SysUser sysUser = userService.getById(ajhMeetingSend.getMeetCompere());
ajhMeetingSend.setMeetCompereName( sysUser.getRealname());
if(sysUser != null){
ajhMeetingSend.setMeetCompereName(sysUser.getRealname());
}
}
if(StringUtils.isNotEmpty(ajhMeetingSend.getDepartId()) && StringUtils.isEmpty(ajhMeetingSend.getDepartName())){
SysDepart depart = departService.getById(ajhMeetingSend.getDepartId());
ajhMeetingSend.setDepartName( depart.getDepartName());
if(depart != null){
ajhMeetingSend.setDepartName(depart.getDepartName());
}
}
}
if(ajhMeetingSend==null) {
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/IAjhMeetingService.java
......@@ -18,4 +18,6 @@ public interface IAjhMeetingService extends IService<AjhMeeting> {
IPage<AjhMeeting> queryPageList(Page<AjhMeeting> page, AjhMeeting ajhMeeting);
AjhMeetingVO getDataById(String id);
boolean revoke(AjhMeeting ajhMeeting);
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/impl/AjhMeetingServiceImpl.java
package com.skua.modules.ajh.service.impl;
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.util.ConvertUtils;
import com.skua.modules.ajh.entity.AjhMeeting;
import com.skua.modules.ajh.entity.AjhMeetingSend;
import com.skua.modules.ajh.mapper.AjhMeetingMapper;
......@@ -40,6 +42,16 @@ public class AjhMeetingServiceImpl extends ServiceImpl<AjhMeetingMapper, AjhMeet
@Override
public void sendMeettingNotice(AjhMeeting ajhMeeting) {
//判断是否已经创建完通知
QueryWrapper<AjhMeetingSend> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("meet_id",ajhMeeting.getId());
List<AjhMeetingSend> list = ajhMeetingSendService.getList(queryWrapper);
if(list.size() > 0){
for (AjhMeetingSend ajhMeetingSend : list) {
ajhMeetingSend.setSendStatus("0");
}
ajhMeetingSendService.saveOrUpdateBatch(list);
}else{
//获取所有的有会议权限的用户
List<Map<String,String>> userList = ajhMeetingMapper.getMeetUsers(MEET_NOTICE_ROLE_CODE);
if(userList.size() > 0){
......@@ -82,9 +94,8 @@ public class AjhMeetingServiceImpl extends ServiceImpl<AjhMeetingMapper, AjhMeet
}
}
}
}
}
}
@Override
......@@ -99,4 +110,20 @@ public class AjhMeetingServiceImpl extends ServiceImpl<AjhMeetingMapper, AjhMeet
AjhMeetingVO ajhMeeting = ajhMeetingMapper.getDataById(id);
return ajhMeeting;
}
@Override
public boolean revoke(AjhMeeting ajhMeeting) {
QueryWrapper<AjhMeetingSend> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("meet_id",ajhMeeting.getId());
List<AjhMeetingSend> list = ajhMeetingSendService.getList(queryWrapper);
for (AjhMeetingSend ajhMeetingSend : list) {
ajhMeetingSend.setSendStatus("2");
}
boolean ok = ajhMeetingSendService.saveOrUpdateBatch(list);
if(ok){
ajhMeeting.setSendStatus("0");//状态修改为未发布
ajhMeetingMapper.updateById(ajhMeeting);
}
return ok;
}
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/controller/SysAlgorithmLibraryController.java
......@@ -60,11 +60,7 @@ public class SysAlgorithmLibraryController {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<SysAlgorithmLibrary>> result = new Result<IPage<SysAlgorithmLibrary>>();
Map<String, String[]> paramMap = req.getParameterMap();
QueryWrapper<SysAlgorithmLibrary> queryWrapper = QueryGenerator.initQueryWrapper(sysAlgorithmLibrary, req.getParameterMap());
Page<SysAlgorithmLibrary> page = new Page<>(pageNo, pageSize);
IPage<SysAlgorithmLibrary> pageList = sysAlgorithmLibraryService.page(page, queryWrapper);
List<SysAlgorithmLibrary> sysAlgorithmLibraryList = pageList.getRecords();
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/controller/SysAlgorithmStatisticsLibraryController.java
......@@ -99,30 +99,6 @@ public class SysAlgorithmStatisticsLibraryController {
return result;
}
@AutoLog(value = "统计功能配置表-统计计算")
@ApiOperation(value="统计功能配置表-统计计算", notes="统计功能配置表-统计计算")
@PostMapping(value = "/statistics/waterData")
public Result<SysAlgorithmStatisticsResultVO> statisticsByWaterData(@RequestBody JSONObject jsonObject,
HttpServletRequest req) throws Exception {
Result<SysAlgorithmStatisticsResultVO> result = new Result<>();
//将jsonObject转sysAlgorithmStatisticsLibraryVO对象
SysAlgorithmStatisticsLibraryVO sysAlgorithmStatisticsLibraryVO = JSONObject.toJavaObject(jsonObject, SysAlgorithmStatisticsLibraryVO.class);
//将jsonObject转Map对象
Map<String,Object> paramMap = JSONObject.toJavaObject(jsonObject,Map.class);
//将paramMap集合去掉SysAlgorithmStatisticsLibraryVO对象内容
Map<String,Object> sysAlgorithmStatisticsLibraryVOMap = JSON.parseObject(JSON.toJSONString(sysAlgorithmStatisticsLibraryVO), new TypeReference<Map<String, Object>>() {});
//Maps.difference(Map, Map)用来比较两个Map以获取所有不同点
MapDifference<String, Object> difference = Maps.difference(paramMap, sysAlgorithmStatisticsLibraryVOMap);
// 键只存在于左边Map的映射项
paramMap = difference.entriesOnlyOnLeft();
SysAlgorithmStatisticsResultVO vo = sysAlgorithmStatisticsLibraryService.statistics(sysAlgorithmStatisticsLibraryVO,paramMap);
//todo 演示暂时注释
result.setSuccess(true);
result.setResult(vo);
return result;
}
/**
* 添加
* @param sysAlgorithmStatisticsLibrary
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/entity/SysAlgorithmDatabaseInfo.java
......@@ -28,21 +28,21 @@ public class SysAlgorithmDatabaseInfo {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private java.lang.String id;
private String id;
/**项目名称*/
@Excel(name = "项目名称", width = 15)
@ApiModelProperty(value = "项目名称")
private java.lang.String projectName;
private String projectName;
/**数据库连接地址*/
@Excel(name = "数据库连接地址", width = 15)
@ApiModelProperty(value = "数据库连接地址")
private java.lang.String url;
private String url;
/**数据库用户名*/
@Excel(name = "数据库用户名", width = 15)
@ApiModelProperty(value = "数据库用户名")
private java.lang.String username;
private String username;
/**数据库密码*/
@Excel(name = "数据库密码", width = 15)
@ApiModelProperty(value = "数据库密码")
private java.lang.String pwd;
private String pwd;
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/entity/SysAlgorithmInterfaceService.java
......@@ -23,17 +23,17 @@ public class SysAlgorithmInterfaceService {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private java.lang.String id;
private String id;
/**服务名称*/
@Excel(name = "服务名称", width = 15)
@ApiModelProperty(value = "服务名称")
private java.lang.String serviceName;
private String serviceName;
/**服务编码*/
@Excel(name = "服务编码", width = 15)
@ApiModelProperty(value = "服务编码")
private java.lang.String serviceCode;
private String serviceCode;
/**服务bean对象*/
@Excel(name = "服务bean对象", width = 15)
@ApiModelProperty(value = "服务bean对象")
private java.lang.String serviceBean;
private String serviceBean;
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/entity/SysAlgorithmLibrary.java
......@@ -4,15 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.List;
......@@ -29,72 +26,51 @@ public class SysAlgorithmLibrary {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private java.lang.String id;
private String id;
/**厂站id*/
@Excel(name = "厂站id", width = 15)
@ApiModelProperty(value = "厂站id")
private java.lang.String departId;
private String departId;
/**算法名称*/
@Excel(name = "算法名称", width = 15)
@ApiModelProperty(value = "算法名称")
private java.lang.String algorithmName;
private String algorithmName;
/**算法编码*/
@Excel(name = "算法编码", width = 15)
@ApiModelProperty(value = "算法编码")
private java.lang.String algorithmCode;
private String algorithmCode;
/**算法描述*/
@Excel(name = "算法描述", width = 15)
@ApiModelProperty(value = "算法描述")
private java.lang.String algorithmDesc;
private String algorithmDesc;
/**算法公式*/
@Excel(name = "算法公式", width = 15)
@ApiModelProperty(value = "算法公式")
private java.lang.String algorithmFormula;
private String algorithmFormula;
/**算法公式*/
@Excel(name = "算法公式说明", width = 15)
@ApiModelProperty(value = "算法公式说明")
private java.lang.String algorithmFormulaName;
private String algorithmFormulaName;
/**算法级别*/
@Excel(name = "算法级别", width = 15)
@ApiModelProperty(value = "算法级别")
private java.lang.String algorithmLevel;
private String algorithmLevel;
/**计算方式1求和4平均*/
@Excel(name = "计算方式1求和4平均", width = 15)
@ApiModelProperty(value = "计算方式1求和4平均")
private java.lang.String calculationType;
private String calculationType;
/**单位*/
@Excel(name = "单位", width = 15)
@ApiModelProperty(value = "单位")
private java.lang.String unit;
private String unit;
/**小数保留位数*/
@Excel(name = "小数保留位数", width = 15)
@ApiModelProperty(value = "小数保留位数")
private java.lang.String scale;
private String scale;
/**系统内置标记*/
@Excel(name = "系统内置标记", width = 15)
@ApiModelProperty(value = "系统内置标记【1系统/0项目】")
private java.lang.String systemTag;
//@Excel(name = "创建人Id", width = 15)
@ApiModelProperty(value = "创建人Id")
private java.lang.String createBy;
/**创建时间*/
//@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private java.util.Date createTime;
/**修改人Id*/
//@Excel(name = "修改人Id", width = 15)
@ApiModelProperty(value = "修改人Id")
private java.lang.String updateBy;
/**修改时间*/
//@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间")
private java.util.Date updateTime;
private String systemTag;
/**计算项配置*/
@Excel(name = "计算项配置", width = 15)
@ApiModelProperty(value = "计算项配置")
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/entity/SysAlgorithmStatisticsLibrary.java
......@@ -24,58 +24,58 @@ public class SysAlgorithmStatisticsLibrary {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private java.lang.String id;
private String id;
/**统计编码*/
@Excel(name = "统计编码", width = 15)
@ApiModelProperty(value = "统计编码")
private java.lang.String statisticsCode;
private String statisticsCode;
/**统计名称*/
@Excel(name = "统计名称", width = 15)
@ApiModelProperty(value = "统计名称")
private java.lang.String statisticsName;
private String statisticsName;
/**统计类型0数字、1统计图、2数字列表*/
@Excel(name = "统计类型0数字、1统计图、2数字列表", width = 15)
@ApiModelProperty(value = "统计类型0数字、1统计图、2数字列表")
@Dict(dicCode = "cheAlasType")
private java.lang.String statisticsType;
private String statisticsType;
/**同比0不启用、1启用*/
@Excel(name = "同比0不启用、1启用", width = 15)
@ApiModelProperty(value = "同比0不启用、1启用")
private java.lang.String statisticsTb;
private String statisticsTb;
/**环比0不启用、1启用*/
@Excel(name = "环比0不启用、1启用", width = 15)
@ApiModelProperty(value = "环比0不启用、1启用")
private java.lang.String statisticsHb;
private String statisticsHb;
/**上期0不启用、1启用*/
@Excel(name = "上期0不启用、1启用", width = 15)
@ApiModelProperty(value = "上期0不启用、1启用")
private java.lang.String statisticsPre;
private String statisticsPre;
/**公式id*/
@Excel(name = "公式id", width = 15)
@ApiModelProperty(value = "公式id")
private java.lang.String algorithmId;
private String algorithmId;
/**统计粒度day、month、year*/
@Excel(name = "统计粒度day、month、year", width = 15)
@ApiModelProperty(value = "统计粒度day、month、year")
private java.lang.String statisticsGranularity;
private String statisticsGranularity;
/**分组字段factory、time*/
@Excel(name = "分组字段factory、time", width = 15)
@ApiModelProperty(value = "分组字段factory、time")
private java.lang.String groupField;
private String groupField;
/**自定义逻辑类*/
@Excel(name = "自定义逻辑类", width = 15)
@ApiModelProperty(value = "自定义逻辑类")
private java.lang.String customService;
private String customService;
/**数据类型（0:日表和填报，1:小时表，2:实时表）*/
@Excel(name = "数据类型（0:日表和填报，1:小时表，2:实时表）", width = 15)
@ApiModelProperty(value = "数据类型（0:日表和填报，1:小时表，2:实时表）")
private java.lang.String dataType;
private String dataType;
/**机构类型*/
@Excel(name = "机构类型", width = 15)
@ApiModelProperty(value = "机构类型")
private java.lang.String departType;
private String departType;
/**是否查询子机构（0：不是，1：是）*/
@Excel(name = "是否查询子机构（0：不是，1：是）", width = 15)
@ApiModelProperty(value = "是否查询子机构（0：不是，1：是）")
private java.lang.String isChildDepart;
private String isChildDepart;
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/entity/SysDataCalculationParam.java
......@@ -26,21 +26,21 @@ public class SysDataCalculationParam {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private java.lang.String id;
private String id;
/**标签*/
@Excel(name = "标签", width = 15)
@ApiModelProperty(value = "标签")
private java.lang.String metricTag;
private String metricTag;
/**计算类型（1:求和；4:平均）*/
@Excel(name = "计算类型（1:求和；4:平均）", width = 15)
@ApiModelProperty(value = "计算类型（1:求和；4:平均）")
private java.lang.String calculationType;
private String calculationType;
/**时间粒度*/
@Excel(name = "时间粒度", width = 15)
@ApiModelProperty(value = "时间粒度")
private java.lang.String timePeriod;
private String timePeriod;
/**单位*/
@Excel(name = "单位", width = 15)
@ApiModelProperty(value = "单位")
private java.lang.String unit;
private String unit;
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/handle/IAlarmLimitCustomService.java
......@@ -5,5 +5,17 @@ import java.util.Map;
public interface IAlarmLimitCustomService {
/**
* <pre>
* <请输入描述信息> 指标值报警预警上下限信息
* </pre>
* @param departIds 厂站ids
* @param
* @author Gao Ran,
* @Description: stringIntegerMap key->factoryId+_+code val->报警上下限值
*/
Map<String, Map<String,Double>> getAlarmLimitData(String departIds);
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/handle/impl/DesignScaleInterfaceDataServiceImpl.java
package com.skua.modules.algorithm.handle.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.skua.core.util.ConvertUtils;
import com.skua.core.util.DateUtils;
import com.skua.modules.algorithm.entity.InterfaceData;
import com.skua.modules.algorithm.handle.IInterfaceDataCustomService;
......@@ -40,7 +41,7 @@ public class DesignScaleInterfaceDataServiceImpl implements IInterfaceDataCustom
interfaceData = new InterfaceData();
interfaceData.setDepartId(sysFactoryInfo.getDepartId());
interfaceData.setDataTime(day);
interfaceData.setDataVal(Double.parseDouble(sysFactoryInfo.getProScale()));
interfaceData.setDataVal(ConvertUtils.getDouble(sysFactoryInfo.getProScale(),0));
interfaceDataList.add(interfaceData);
}
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/handle/impl/IAlarmLimitCustomServiceImpl.java
......@@ -20,6 +20,4 @@ public class IAlarmLimitCustomServiceImpl implements IAlarmLimitCustomService {
return new HashMap<>();
}
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/handle/impl/SafeOperationInterfaceDataServiceImpl.java 0 → 100644
package com.skua.modules.algorithm.handle.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.skua.core.util.DateUtils;
import com.skua.modules.algorithm.entity.InterfaceData;
import com.skua.modules.algorithm.handle.IInterfaceDataCustomService;
import com.skua.modules.system.entity.SysFactoryInfo;
import com.skua.modules.system.service.ISysFactoryInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
/**
* <pre>
* 获取稳定运行天数，算法：水厂档案投产运营时间到当前时间
* </pre>
* @author Li Yuanyuan
* @version V1.0, 2024年12月20日 下午1:55:44
*/
@Component("safeOperationInterfaceDataServiceImpl")
public class SafeOperationInterfaceDataServiceImpl implements IInterfaceDataCustomService {
@Autowired
private ISysFactoryInfoService sysFactoryInfoService;
@Override
public List<InterfaceData> getInterfaceDataList(String departIds, String startDate, String endDate) {
List<InterfaceData> interfaceDataList = new ArrayList<>();
QueryWrapper<SysFactoryInfo> sysFactoryInfoQueryWrapper = new QueryWrapper<>();
sysFactoryInfoQueryWrapper.select("built_time","depart_id");
sysFactoryInfoQueryWrapper.in("depart_id",departIds.split(","));
List<SysFactoryInfo> sysFactoryInfoList = sysFactoryInfoService.list(sysFactoryInfoQueryWrapper);
List<String> dayList = DateUtils.sliceUpDateRange(startDate, endDate, "month");
InterfaceData interfaceData;
for (SysFactoryInfo sysFactoryInfo : sysFactoryInfoList) {
for (String day : dayList) {
interfaceData = new InterfaceData();
interfaceData.setDepartId(sysFactoryInfo.getDepartId());
interfaceData.setDataTime(day);
interfaceData.setDataVal(Double.valueOf(DateUtils.dayDiff(sysFactoryInfo.getBuiltTime(), DateUtils.now())));
interfaceDataList.add(interfaceData);
}
}
return interfaceDataList;
}
}
sk-module-biz/src/main/java/com/skua/modules/algorithm/mapper/SysAlgorithmLibraryMapper.java
......@@ -13,8 +13,7 @@ import java.util.Map;
*/
public interface SysAlgorithmLibraryMapper extends BaseMapper<SysAlgorithmLibrary> {
@Select("SELECT group_concat(id) id FROM sys_depart,(select getDepartTree (#{departId}) departIds) t WHERE FIND_IN_SET(id,departIds) and depart_type = #{departType} " +
" and del_flag='0' order by depart_order")
Map<String,Object> getChildDepartIds(@Param(value = "departId")String departId, @Param(value = "departType")String departType);
@Select("select a.time as data_time,a.depart_id,${dataFillCodes} from ${tablename} a")
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/mapper/xml/SysAlgorithmLibraryMapper.xml
......@@ -2,4 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.algorithm.mapper.SysAlgorithmLibraryMapper">
<select id="getChildDepartIds" resultType="java.util.Map">
SELECT group_concat(id) id FROM sys_depart,
(SELECT getDepartTree(#{departId}) departIds)t
WHERE FIND_IN_SET(id, departIds)
<if test='departType != null'>
AND depart_type IN (${departType})
</if>
AND del_flag = '0' ORDER BY depart_order
</select>
</mapper>
\ No newline at end of file
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/service/impl/CalculationServiceImpl.java
......@@ -38,7 +38,19 @@ public class CalculationServiceImpl implements ICalculationService {
System.out.println("***************计算逻辑开始***************");
try {
List<String> dateList = DateUtils.sliceUpDateRange(startDate, endEnd, "month");
List<SysDataCalculationParam> sysDataCalculationParamList = sysDataCalculationParamService.list();
QueryWrapper<SysDataCalculationParam> qw = new QueryWrapper<SysDataCalculationParam>();
//List<String> tagList = new ArrayList<String>();
//tagList.add("PAC1HHNCTJLLLJ");tagList.add("PAC2HHNCTJLLLJ");tagList.add("PAC1CDCTJLLLJ");tagList.add("PAC2CDCTJLLLJ");
//tagList.add("PAC3CDCTJLLLJ");
//tagList.add("XTJSLJLL1");
//tagList.add("XTJSLJLL2");
//tagList.add("YSN1TJLJLL");tagList.add("YSN2TJLJLL");tagList.add("YSN3TJLJLL");tagList.add("YSN4TJLJLL");
//tagList.add("YSN5TJLJLL");tagList.add("YSN6TJLJLL");tagList.add("YSN7TJLJLL");tagList.add("YSN8TJLJLL");
//tagList.add("YSN9TJLJLL");tagList.add("YSN10TJLJLL");
//qw.in("metric_tag", tagList);
List<SysDataCalculationParam> sysDataCalculationParamList = sysDataCalculationParamService.list(qw);
//删除符合条件的历史数据
for (SysDataCalculationParam sysDataCalculationParam : sysDataCalculationParamList) {
UpdateWrapper<SysDataCalculation> sysDataCalculationUpdateWrapper = new UpdateWrapper<>();
......@@ -57,13 +69,13 @@ public class CalculationServiceImpl implements ICalculationService {
String unit = sysDataCalculationParam.getUnit();
//根据字典获取真实指标编码
QueryWrapper<SysMonitorMetricInfo> sysMonitorMetricInfoQueryWrapper = new QueryWrapper<>();
sysMonitorMetricInfoQueryWrapper.select("id", "fac_code");
sysMonitorMetricInfoQueryWrapper.select("id", "depart_id");
sysMonitorMetricInfoQueryWrapper.eq("metric_uid_tag", metricTag);
List<Map<String, Object>> metricInfoList = sysMonitorMetricInfoService.listMaps(sysMonitorMetricInfoQueryWrapper);
SysDataCalculation sysDataCalculation;
for (Map<String, Object> map : metricInfoList) {
String id = ConvertUtils.getString(map.get("id"));
String departId = ConvertUtils.getString(map.get("fac_code"));
String departId = ConvertUtils.getString(map.get("depart_id"));
//获取小时数据，按要求计算
List<Map<String, Object>> dataList;
try {
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/vo/SysAlgorithmLibraryVO.java
......@@ -18,30 +18,30 @@ public class SysAlgorithmLibraryVO {
/**厂站id*/
@Excel(name = "厂站id", width = 15)
@ApiModelProperty(value = "厂站id")
private java.lang.String departId;
private String departId;
/**算法名称*/
@Excel(name = "算法名称", width = 15)
@ApiModelProperty(value = "算法名称")
private java.lang.String algorithmName;
private String algorithmName;
/**算法编码*/
@Excel(name = "算法编码", width = 15)
@ApiModelProperty(value = "算法编码")
private java.lang.String algorithmCode;
private String algorithmCode;
/**算法计算结果*/
@ApiModelProperty(value = "算法计算结果")
private Map<String, List<Map<String, Object>>> map = new HashMap<String, List<Map<String, Object>>>();
/**开始时间*/
@Excel(name = "开始时间", width = 15)
@ApiModelProperty(value = "开始时间")
private java.lang.String startDate;
private String startDate;
@Excel(name = "结束时间", width = 15)
@ApiModelProperty(value = "结束时间")
private java.lang.String endDate;
private String endDate;
@Excel(name = "时间粒度", width = 15)
@ApiModelProperty(value = "聚合时间粒度，day天、month月")
private java.lang.String timePeriod;
private String timePeriod;
/**系统内置标记*/
@Excel(name = "系统内置标记", width = 15)
@ApiModelProperty(value = "系统内置标记【0系统/1项目】")
private java.lang.String systemTag;
private String systemTag;
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/vo/SysAlgorithmStatisticsLibraryVO.java
......@@ -17,54 +17,54 @@ public class SysAlgorithmStatisticsLibraryVO {
/**主键*/
@TableId(type = IdType.UUID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
private String id;
/**统计编码*/
@Excel(name = "统计编码", width = 15)
@ApiModelProperty(value = "统计编码")
private java.lang.String statisticsCode;
private String statisticsCode;
/**统计名称*/
@Excel(name = "统计名称", width = 15)
@ApiModelProperty(value = "统计名称")
private java.lang.String statisticsName;
private String statisticsName;
/**公式id*/
@Excel(name = "公式id", width = 15)
@ApiModelProperty(value = "公式id")
private java.lang.String algorithmId;
private String algorithmId;
/**统计粒度day、month、year*/
@Excel(name = "统计粒度day、month、year", width = 15)
@ApiModelProperty(value = "统计粒度day、month、year")
private java.lang.String statisticsGranularity;
private String statisticsGranularity;
/**计算方式1求和4平均*/
@Excel(name = "计算方式1求和4平均", width = 15)
@ApiModelProperty(value = "计算方式1求和4平均")
private java.lang.String calculationType;
private String calculationType;
/**分组字段factory、time*/
@Excel(name = "分组字段factory、time", width = 15)
@ApiModelProperty(value = "分组字段factory、time")
private java.lang.String groupField;
private String groupField;
/**自定义逻辑类*/
@Excel(name = "自定义逻辑类", width = 15)
@ApiModelProperty(value = "自定义逻辑类")
private java.lang.String customService;
private String customService;
/**开始时间*/
@Excel(name = "开始时间", width = 15)
@ApiModelProperty(value = "开始时间")
private java.lang.String startDate;
private String startDate;
@Excel(name = "结束时间", width = 15)
@ApiModelProperty(value = "结束时间")
private java.lang.String endDate;
private String endDate;
@ApiModelProperty(value = "厂站id")
private java.lang.String departIds;
private String departIds;
@ApiModelProperty(value = "类型0数据型，1图表型")
private java.lang.String statisticsType;
private String statisticsType;
/**机构类型*/
@Excel(name = "机构类型", width = 15)
@ApiModelProperty(value = "机构类型")
private java.lang.String departType;
private String departType;
/**是否查询子机构（0：不是，1：是）*/
@Excel(name = "是否查询子机构（0：不是，1：是）", width = 15)
@ApiModelProperty(value = "是否查询子机构（0：不是，1：是）")
private java.lang.String isChildDepart;
private String isChildDepart;
/**报表选项code*/
@ApiModelProperty(value = "报表Itme选项code")
......@@ -75,5 +75,4 @@ public class SysAlgorithmStatisticsLibraryVO {
@ApiModelProperty(value = "负载率类型")
private Integer loadRateType;
}
......
sk-module-biz/src/main/java/com/skua/modules/assessment/controller/DataAssessmentSocreMasterController.java
......@@ -11,6 +11,7 @@ import com.skua.core.util.ConvertUtils;
import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
import com.skua.modules.assessment.service.IDataAssessmentSocreMasterService;
import com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO;
import com.skua.modules.emergency.entity.DangerousOperation;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -93,7 +94,8 @@ public class DataAssessmentSocreMasterController {
QueryWrapper<DataAssessmentSocreMaster> query = new QueryWrapper<DataAssessmentSocreMaster>();
query.eq("report_id",dataAssessmentSocreMaster.getReportId());
query.eq("assessment_date",dataAssessmentSocreMaster.getAssessmentDate());
query.eq("assessment_user",dataAssessmentSocreMaster.getAssessmentUser());
query.eq(ConvertUtils.isNotEmpty(dataAssessmentSocreMaster.getAssessmentUser()),"assessment_user",dataAssessmentSocreMaster.getAssessmentUser());
query.eq("depart_id",dataAssessmentSocreMaster.getDepartId());
List<DataAssessmentSocreMaster> list = dataAssessmentSocreMasterService.list(query);
if(list!=null&&list.size()>0) {
result.setResult("yes");
......@@ -185,6 +187,25 @@ public class DataAssessmentSocreMasterController {
return result;
}
@AutoLog(value = "绩效考核基础信息-办结流程")
@ApiOperation(value = "绩效考核基础信息-办结流程", notes = "绩效考核基础信息-办结流程")
@PostMapping(value = "/complete-process")
public Result<DangerousOperation> completeProcess(@RequestBody DataAssessmentSocreMaster purchaseInfo) {
Result<DangerousOperation> result = new Result<>();
try {
boolean flag = dataAssessmentSocreMasterService.completeProcess(purchaseInfo);
if (flag) {
result.success("办结成功!");
} else {
result.error500("办结失败!");
}
} catch (Exception e) {
log.error(e.getMessage(), e);
result.error500("办结失败");
}
return result;
}
@AutoLog(value = "绩效考核基础信息-修改业务数据及流程数据")
@ApiOperation(value="绩效考核基础信息-修改业务数据及流程数据", notes="绩效考核基础信息-修改业务数据及流程数据")
@PostMapping(value = "/editAndModifyProcess")
......@@ -202,7 +223,7 @@ public class DataAssessmentSocreMasterController {
/**
* 通过id查询
* @param id
* @param businessId
* @return
*/
@AutoLog(value = "绩效考核基础信息-通过id查询")
......
sk-module-biz/src/main/java/com/skua/modules/assessment/service/IDataAssessmentSocreMasterService.java
......@@ -49,4 +49,5 @@ public interface IDataAssessmentSocreMasterService extends IService<DataAssessme
List<DataAssessmentSocreMasterVO> getAllData(DataAssessmentSocreMasterVO dataAssessmentSocreMasterVO);
boolean completeProcess(DataAssessmentSocreMaster purchaseInfo);
}
......
sk-module-biz/src/main/java/com/skua/modules/assessment/service/impl/DataAssessmentItemServiceImpl.java
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.util.ConvertUtils;
import com.skua.core.util.UUIDGenerator;
import com.skua.modules.assessment.entity.DataAssessmentItem;
import com.skua.modules.assessment.entity.DataAssessmentMessage;
......@@ -223,8 +224,11 @@ public class DataAssessmentItemServiceImpl extends ServiceImpl<DataAssessmentIte
QueryWrapper<DataAssessmentSocreMaster> dataAssessmentSocreMasterQueryWrapper = new QueryWrapper<>();
dataAssessmentSocreMasterQueryWrapper.eq("report_id",reportId);
dataAssessmentSocreMasterQueryWrapper.eq("assessment_date",dataMonth);
dataAssessmentSocreMasterQueryWrapper.eq("assessment_user",userId);
DataAssessmentSocreMaster assessmentSocreMaster = dataAssessmentSocreMasterService.getOne(dataAssessmentSocreMasterQueryWrapper);
dataAssessmentSocreMasterQueryWrapper.eq(ConvertUtils.isNotEmpty(factoryId),"depart_id",factoryId);
dataAssessmentSocreMasterQueryWrapper.eq(ConvertUtils.isNotEmpty(userId),"assessment_user",userId);
List<DataAssessmentSocreMaster> masterList = dataAssessmentSocreMasterService.list(dataAssessmentSocreMasterQueryWrapper);
if(masterList.size()>0){
DataAssessmentSocreMaster assessmentSocreMaster = masterList.get(0);
assessmentSocreMaster.setAssessmentScore(totalScore);
assessmentSocreMaster.setLeaderScore(dataAssessmentItemSubmitVO.getLeaderScore());
assessmentSocreMaster.setSelfScore(dataAssessmentItemSubmitVO.getSelfScore());
......@@ -232,4 +236,5 @@ public class DataAssessmentItemServiceImpl extends ServiceImpl<DataAssessmentIte
}
}
}
}
}
......
sk-module-biz/src/main/java/com/skua/modules/assessment/service/impl/DataAssessmentSocreMasterServiceImpl.java
......@@ -6,6 +6,8 @@ import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
import com.skua.modules.assessment.mapper.DataAssessmentSocreMasterMapper;
import com.skua.modules.assessment.service.IDataAssessmentSocreMasterService;
import com.skua.modules.assessment.vo.DataAssessmentSocreMasterVO;
import com.skua.modules.emergency.entity.DangerousOperation;
import com.skua.modules.flow.business.service.FlowBusinessService;
import com.skua.modules.flow.business.service.IFlowService;
import com.skua.modules.flow.core.constant.ProcessConstant;
import com.skua.modules.flow.core.entity.BladeFlow;
......@@ -13,22 +15,31 @@ import com.skua.modules.flow.core.utils.FlowUtil;
import com.skua.modules.flow.support.Kv;
import com.skua.modules.flow.utils.Func;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.skua.modules.safe.service.IEnvironmentTargetService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
/**
* 绩效考核评分基础信息
*/
@Service
public class DataAssessmentSocreMasterServiceImpl extends ServiceImpl<DataAssessmentSocreMasterMapper, DataAssessmentSocreMaster> implements IDataAssessmentSocreMasterService {
@Autowired
private IFlowService flowService;
@Autowired
private FlowBusinessService flowBusinessService;
@Autowired
private IEnvironmentTargetService environmentTargetService;
@Override
public Page<DataAssessmentSocreMasterVO> queryCustomPageList(Page<DataAssessmentSocreMasterVO> pageList,
......@@ -79,5 +90,22 @@ public class DataAssessmentSocreMasterServiceImpl extends ServiceImpl<DataAssess
return baseMapper.getAllData(dataAssessmentSocreMasterVO);
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean completeProcess(DataAssessmentSocreMaster assessmentSocreMaster) {
boolean flag = false;//返回结果
DataAssessmentSocreMaster dataAssessmentSocreMaster = baseMapper.selectById(assessmentSocreMaster.getId());
if(dataAssessmentSocreMaster!=null){
this.updateById(dataAssessmentSocreMaster);
//调用同意接口
flag = flowBusinessService.completeTask(ProcessConstant.PASS_KEY, assessmentSocreMaster.getFlow());
//同步分数入环保目标表 写死 安全环保责任状ID
if("1859413989066813442".equals(dataAssessmentSocreMaster.getReportId())||
"1872156241933414401".equals(dataAssessmentSocreMaster.getReportId())){
environmentTargetService.addOrEdit(dataAssessmentSocreMaster);
}
}
return flag;
}
}
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/controller/SysCommandCentreController.java → sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/controller/SysCommandCentreController.java
package com.skua.modules.algorithm.controller;
package com.skua.modules.dataAnalysis.controller;
import com.skua.common.constant.ReportConstant;
import com.skua.common.report.ReportViewUtil;
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.ConvertUtils;
import com.skua.modules.algorithm.service.ICommandCentreService;
import com.skua.modules.dataAnalysis.service.ICommandCentreService;
import com.skua.modules.algorithm.service.impl.ReportItemvService;
import com.skua.modules.algorithm.vo.*;
import com.skua.modules.algorithm.vo.DepartLoadRateResultVO;
import com.skua.modules.algorithm.vo.ReportItemVO;
import com.skua.modules.algorithm.vo.StackedAreaChartDataVO;
import com.skua.modules.algorithm.vo.WaterTreatmentVO;
import com.skua.modules.common.vo.DateVO;
import com.skua.modules.guest.util.DateUtil;
import com.skua.modules.report.entity.FReportItemv;
import com.skua.modules.report.vo.*;
import com.skua.modules.system.service.ISysConfigService;
import com.skua.modules.report.vo.DepartDrugResult;
import com.skua.modules.report.vo.FRportlCommandCenterVO;
import com.skua.modules.report.vo.ReportDateTrendVO;
import com.skua.modules.report.vo.ReportItemvParam;
import com.skua.modules.system.service.ISysFactoryInfoService;
import com.skua.tool.util.DateUtils;
import com.skua.tool.util.DigitalUtils;
import com.skua.tool.util.JSUtils;
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.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDate;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
/**
* 统计功能配置表
......@@ -42,6 +44,7 @@ import java.util.*;
@RestController
@RequestMapping("/v1/algorithm/commandCentre")
public class SysCommandCentreController {
@Autowired
private ISysFactoryInfoService factoryInfoService;
@Autowired
......@@ -56,7 +59,7 @@ public class SysCommandCentreController {
@AutoLog(value = "指挥中心-水量查询")
@ApiOperation(value="指挥中心-水量查询", notes="指挥中心-水量查询")
@GetMapping(value = "/statisticsByWaterData")
public Result<List<FRportlCommandCenterVO>> statisticsByWaterData(ReportItemvParam reportItemvParam)throws Exception{
public Result<List<FRportlCommandCenterVO>> statisticsByWaterData(ReportItemvParam reportItemvParam) throws Exception{
Result<List<FRportlCommandCenterVO> > result = new Result<>();
List<FRportlCommandCenterVO> fReportItemvList = new ArrayList<>();//返回集合对象
DateVO dateVO = new DateVO(reportItemvParam.getStartDate());
......@@ -70,7 +73,7 @@ public class SysCommandCentreController {
long nowDifferDay = DateUtils.differenceDay(dateVO.getNowMonthStartDate(),dateVO.getNowMonthEndDate());
long lastMonthDifferDay = DateUtils.differenceDay(dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
//月对象数据String value, String valueTb, String valueHb
//月对象数据 value, valueTb, valueHb
FRportlCommandCenterVO monthDataVO = new FRportlCommandCenterVO("月汇总数据",JSUtils.divide(monthCSL,10000),JSUtils.divide(lastMonthCSL,10000),JSUtils.divide(lastYearCSL,10000));
//日处理对象
FRportlCommandCenterVO avgDayDataVO = new FRportlCommandCenterVO("日均处理水量",JSUtils.divide(monthCSL,nowDifferDay*10000),JSUtils.divide(lastMonthCSL,lastMonthDifferDay*10000),JSUtils.divide(lastYearCSL,lastYearDifferDay*10000));
......@@ -80,7 +83,6 @@ public class SysCommandCentreController {
//年数据统计：
String total = factoryInfoService.querySumProScale();
total = String.format("%.2f", Double.parseDouble(total));
// total = DigitalUtils.multiply(total,"10000");
fReportItemvList.add( new FRportlCommandCenterVO( total,"0","0"));
result.setSuccess(true);
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/service/ICommandCentreService.java → sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/service/ICommandCentreService.java
package com.skua.modules.algorithm.service;
package com.skua.modules.dataAnalysis.service;
import com.skua.modules.algorithm.vo.WaterTreatmentVO;
import com.skua.modules.report.vo.*;
......
sk-module-biz/src/main/java/com/skua/modules/algorithm/service/impl/CommandCentreServiceImpl.java → sk-module-biz/src/main/java/com/skua/modules/dataAnalysis/service/impl/CommandCentreServiceImpl.java
package com.skua.modules.algorithm.service.impl;
package com.skua.modules.dataAnalysis.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;
import com.skua.modules.algorithm.service.ICommandCentreService;
import com.skua.modules.dataAnalysis.service.ICommandCentreService;
import com.skua.modules.algorithm.vo.WaterTreatmentVO;
import com.skua.modules.common.vo.DateVO;
import com.skua.modules.quartz.util.BaseUtil;
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/EnvironmentTarget.java
package com.skua.modules.safe.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -66,7 +64,9 @@ public class EnvironmentTarget {
@Excel(name = "责任指标评分", width = 15)
@ApiModelProperty(value = "责任指标评分")
private String liabilityScore ;
/**安全环保目标责任状*/
@ApiModelProperty(value = "安全环保目标责任状")
private String targetFile;
/**创建人Id*/
@Excel(name = "创建人Id", width = 15)
@ApiModelProperty(value = "创建人Id")
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/IEnvironmentTargetService.java
package com.skua.modules.safe.service;
import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
import com.skua.modules.safe.entity.EnvironmentTarget;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.scheduling.annotation.Async;
/**
* 安环环保目标
......@@ -9,4 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface IEnvironmentTargetService extends IService<EnvironmentTarget> {
boolean checkData(String departId, String targetYear);
@Async
void addOrEdit(DataAssessmentSocreMaster dataAssessmentSocreMaster);
}
......
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/EnvironmentTargetServiceImpl.java
package com.skua.modules.safe.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.skua.modules.assessment.entity.DataAssessmentSocreMaster;
import com.skua.modules.safe.entity.EnvironmentTarget;
import com.skua.modules.safe.mapper.EnvironmentTargetMapper;
import com.skua.modules.safe.service.IEnvironmentTargetService;
import io.swagger.annotations.ApiModelProperty;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
......@@ -16,6 +20,9 @@ import java.util.List;
@Service
public class EnvironmentTargetServiceImpl extends ServiceImpl<EnvironmentTargetMapper, EnvironmentTarget> implements IEnvironmentTargetService {
@Autowired
private EnvironmentTargetMapper environmentTargetMapper;
/***
* 校验一个水厂一年只能提交一次数据
* @param departId
......@@ -32,5 +39,36 @@ public class EnvironmentTargetServiceImpl extends ServiceImpl<EnvironmentTargetM
}
return true;
}
@Override
public void addOrEdit(DataAssessmentSocreMaster dataAssessmentSocreMaster) {
EnvironmentTarget environmentTarget = new EnvironmentTarget();
environmentTarget.setDepartId(dataAssessmentSocreMaster.getDepartId());
environmentTarget.setTargetYear(dataAssessmentSocreMaster.getAssessmentDate());
//1859413989066813442 //安全环保目标责任状（约束指标） constraintScore
if("1859413989066813442".equals(dataAssessmentSocreMaster.getReportId())){
environmentTarget.setConstraintScore(dataAssessmentSocreMaster.getSelfScore());
}
//1872156241933414401 //安全环保目标责任状（责任指标） liabilityScore
if("1872156241933414401".equals(dataAssessmentSocreMaster.getReportId())){
environmentTarget.setLiabilityScore(dataAssessmentSocreMaster.getSelfScore());
}
QueryWrapper<EnvironmentTarget> queryWrapper = new QueryWrapper();
queryWrapper.eq("depart_id" ,dataAssessmentSocreMaster.getDepartId()) ;
queryWrapper.eq("target_year" ,dataAssessmentSocreMaster.getAssessmentDate()) ;
List<EnvironmentTarget> list = this.baseMapper.selectList(queryWrapper);
if (list != null && !list.isEmpty()) {
EnvironmentTarget oldEnvironmentTarget = list.get(0);
environmentTarget.setId(oldEnvironmentTarget.getId());
environmentTarget.setDepartAncestors(oldEnvironmentTarget.getDepartAncestors());
environmentTarget.setWorkerDeathNum(oldEnvironmentTarget.getWorkerDeathNum());
environmentTarget.setSuddenlyNum(oldEnvironmentTarget.getSuddenlyNum());
environmentTarget.setNewCaseNum(oldEnvironmentTarget.getNewCaseNum());
environmentTarget.setExamScore(oldEnvironmentTarget.getExamScore());
environmentTargetMapper.updateById(oldEnvironmentTarget);
}else{
environmentTargetMapper.insert(environmentTarget);
}
}
}
......
sk-module-datafill/src/main/java/com/skua/modules/job/DayDataSyncJob.java
......@@ -35,7 +35,7 @@ public class DayDataSyncJob implements Job {
private ISysFactoryDeviceService sysFactoryDeviceService;
@Autowired
private IReportDataService reportDataService;
private DecimalFormat df = new DecimalFormat("######0.0000");
private DecimalFormat df = new DecimalFormat("######0");
/**
* 若参数变量名修改 QuartzJobController中也需对应修改
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/entity/EquipmentRepair.java
package com.skua.modules.equipment.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -13,7 +10,6 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.skua.core.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
......@@ -168,6 +164,9 @@ public class EquipmentRepair {
@Excel(name = "委外附件", width = 15)
@ApiModelProperty(value = "委外附件")
private java.lang.String outsourceFilepath;
/**维修费用*/
@ApiModelProperty(value = "维修费用")
private java.lang.String totalCost;
/**验收人员*/
@Excel(name = "验收人员", width = 15)
@ApiModelProperty(value = "验收人员")
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentRepairVO.java
......@@ -122,6 +122,9 @@ public class EquipmentRepairVO extends FlowEntity {
@Excel(name = "维修用时", width = 15)
@ApiModelProperty(value = "维修用时")
private java.lang.Double costHour;
/**维修费用*/
@ApiModelProperty(value = "维修费用")
private java.lang.String totalCost;
/**故障原因*/
@Excel(name = "故障原因", width = 15)
@ApiModelProperty(value = "故障原因")
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!