公式功能迁移

@@ -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();

@@ -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

@@ -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;
 }

@@ -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;
 }

@@ -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 = "计算项配置")

@@ -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;
 }

@@ -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;
 }

@@ -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);
+
 }

 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);
             }
         }

@@ -20,6 +20,4 @@ public class IAlarmLimitCustomServiceImpl implements IAlarmLimitCustomService {
         return new HashMap<>();
     }
 
-
-
 }

+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;
+    }    
+}

@@ -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")

@@ -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

@@ -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 {

@@ -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;
 }

@@ -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;
-
 }

-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.*;

-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;

 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")