删除不需要项目

vseaf4.4-analyze/pom.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>cn.com.victorysoft</groupId>
-	<artifactId>vseaf4.4-analyze</artifactId>
-	<packaging>jar</packaging>
-
-	<parent>
-		<groupId>cn.com.victorysoft</groupId>
-		<artifactId>vseaf-service-template</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-sys</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-
-</project>

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/constant/CstDataTypeEnum.java

@@ -1,6 +0,0 @@
-package cn.com.victorysoft.business.analyze.constant;
-
-public enum CstDataTypeEnum {
-
-    VARCHAR, DATE, NUMBER, DICT;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/constant/CstGroupType.java

@@ -1,9 +0,0 @@
-package cn.com.victorysoft.business.analyze.constant;
-
-public class CstGroupType {
-
-    public final static String SUM = "sum";
-    public final static String AVG = "avg";
-    public final static String MAX = "max";
-    public final static String MIN = "min";
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/constant/CstOperator.java

@@ -1,16 +0,0 @@
-package cn.com.victorysoft.business.analyze.constant;
-
-public class CstOperator {
-
-    public final static String EQUAL = "equal";
-    public final static String NOT_EQUAL = "not_equal";
-    public final static String LIKE = "like";
-    public final static String NOT_LIKE = "not_like";
-    public final static String NULL = "null";
-    public final static String NOT_NULL = "not_null";
-    public final static String LT = "lt";
-    public final static String LTE = "lte";
-    public final static String GT = "gt";
-    public final static String GTE = "gte";
-    public final static String BETWEEN = "between";
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/controller/CustomSearchController.java

@@ -1,142 +0,0 @@
-package cn.com.victorysoft.business.analyze.controller;
-
-import cn.com.victorysoft.business.analyze.entity.*;
-import cn.com.victorysoft.business.analyze.param.CstDataSourceParam;
-import cn.com.victorysoft.business.analyze.param.CstSearchExportParam;
-import cn.com.victorysoft.business.analyze.param.CstSearchParam;
-import cn.com.victorysoft.business.analyze.service.CustomSearchService;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-@Api(tags = "自定义查询")
-@RestController
-@RequestMapping("analyze/custom")
-public class CustomSearchController {
-
-    @Resource
-    private CustomSearchService customSearchService;
-
-    @GetMapping("/dict")
-    @ApiOperation(value = "查询附录数据", notes = "默认只返回前50条，前端做成使用searchText搜索")
-    public List<CstDictData> dict(CstDataSourceParam param) {
-        return customSearchService.selectDictData(param);
-    }
-
-    @GetMapping("/templates")
-    @ApiOperation("查询模板列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "unitcode", value = "单位代码", paramType = "query", required = true)
-    })
-    public List<CstTemplate> templates(String unitcode) {
-        return customSearchService.selectTemplates(unitcode);
-    }
-
-    @GetMapping("/template/{id}")
-    @ApiOperation("查询模板对象")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "模板ID", paramType = "path", required = true)
-    })
-    public CstTemplate getTemplate(@PathVariable("id") String id) {
-        return customSearchService.selectTemplate(id);
-    }
-
-    @DeleteMapping("/template/{id}")
-    @ApiOperation("删除模板")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "模板ID", paramType = "path", required = true)
-    })
-    public void deleteTemplate(@PathVariable("id") String id) {
-        customSearchService.deleteTemplate(id);
-    }
-
-    @PostMapping("/template")
-    @ApiOperation("新增模板")
-    public void insertTemplate(@RequestBody CstTemplate template) {
-        customSearchService.insertTemplate(template);
-    }
-
-    @PutMapping("/template")
-    @ApiOperation("更新模板")
-    public void updateTemplate(@RequestBody CstTemplate template) {
-        customSearchService.updateTemplate(template);
-    }
-
-    @PostMapping("/template/share/{id}")
-    @ApiOperation("分享模板")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "模板ID", paramType = "path", required = true),
-            @ApiImplicitParam(name = "unitcodes", value = "单位代码数组", paramType = "array", required = true),
-    })
-    public void shareTemplate(@PathVariable("id") String id, String[] unitcodes) {
-        customSearchService.shareTemplate(id, unitcodes);
-    }
-
-    @GetMapping("/template/share/{id}")
-    @ApiOperation("查询模板分享单位")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "模板ID", paramType = "path", required = true)
-    })
-    public CstTemplateShareUnit getShareUnits(@PathVariable("id") String id) {
-        return customSearchService.selectShareUnits(id);
-    }
-
-    @GetMapping("/tables")
-    @ApiOperation("查询数据表")
-    public List<CstTable> tables() {
-        return customSearchService.selectTables();
-    }
-
-    @GetMapping("/table/relation/{id}")
-    @ApiOperation("查询关联表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "数据表ID", paramType = "path", required = true),
-    })
-    public List<CstTable> relateTables(@PathVariable("id") String id) {
-        return customSearchService.selectRelateTables(id);
-    }
-
-    @GetMapping("/table/indicator/{id}")
-    @ApiOperation("查询数据表指标")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "数据表ID", paramType = "path", required = true),
-    })
-    public List<CstTableIndicator> tableIndicators(@PathVariable("id") String id) {
-        return customSearchService.selectTableIndicators(id);
-    }
-
-    @GetMapping("/indicator/{tableType}")
-    @ApiOperation("根据表类型查询指标")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "tableType", value = "表类型", paramType = "path", required = true),
-            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query", required = true),
-            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query", required = true),
-            @ApiImplicitParam(name = "searchField", value = "查询文本", paramType = "query", required = false),
-    })
-    public PageInfo<CstIndicator> indicators(@PathVariable("tableType") String tableType, Integer pageNum, Integer pageSize, String searchField) {
-        return customSearchService.selectIndicators(tableType, pageNum, pageSize, searchField);
-    }
-
-    @PostMapping("/search")
-    @ApiOperation(value = "查询数据结果")
-    public PageInfo<Map<String, Object>> search(@RequestBody CstSearchParam param) {
-        return customSearchService.search(param);
-    }
-
-    @PostMapping("/export")
-    @ApiOperation(value = "导出数据结果")
-    public ExportResult export(@RequestBody CstSearchExportParam param) {
-        List<Map<String, Object>> list = customSearchService.searchList(param, false);
-        return ExcelUtils.exportMap(param.getColumnConfig(), list, param.getFileName());
-    }
-
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/dao/CustomSearchDao.java

@@ -1,160 +0,0 @@
-package cn.com.victorysoft.business.analyze.dao;
-
-import cn.com.victorysoft.business.analyze.entity.*;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface CustomSearchDao {
-
-    /**
-     * 根据ID查询数据源
-     */
-    CstDataSource selectDataSourceById(String dataSourceId);
-
-    /**
-     * 查询附录数据
-     */
-    List<CstDictData> selectDictData(@Param("dataSource") CstDataSource dataSource, @Param("searchText") String searchText);
-
-    /**
-     * 查询单位的模板列表
-     */
-    List<CstTemplate> selectTemplates(String unitcode);
-
-    /**
-     * 查询模板对象
-     */
-    CstTemplate selectTemplate(String id);
-
-    /**
-     * 删除模板指标
-     */
-    int deleteTemplate(String id);
-
-    /**
-     * 插入模板指标
-     */
-    void insertTemplate(CstTemplate template);
-
-    /**
-     * 更新模板指标
-     */
-    void updateTemplate(CstTemplate template);
-
-    /**
-     * 查询模板数据表
-     */
-    List<CstTemplateTable> selectTemplateTables(String templateId);
-
-    /**
-     * 删除模板数据表
-     */
-    int deleteTemplateTables(String templateId);
-
-    /**
-     * 插入模板数据表
-     */
-    void insertTemplateTables(List<CstTemplateTable> indicators);
-
-    /**
-     * 查询模板指标
-     */
-    List<CstTemplateIndicator> selectTemplateIndicators(String templateId);
-
-    /**
-     * 删除模板指标
-     */
-    int deleteTemplateIndicators(String templateId);
-
-    /**
-     * 插入模板指标
-     */
-    void insertTemplateIndicators(List<CstTemplateIndicator> indicators);
-
-    /**
-     * 查询模板条件列表
-     */
-    List<CstTemplateCondition> selectTemplateConditions(String templateId);
-
-    /**
-     * 查询模板条件
-     */
-    CstTemplateCondition selectTemplateCondition(@Param("templateId") String templateId, @Param("indicatorId") String indicatorId);
-
-    /**
-     * 删除模板条件
-     */
-    int deleteTemplateConditions(String templateId);
-
-    /**
-     * 插入模板条件
-     */
-    void insertTemplateConditions(List<CstTemplateCondition> conditions);
-
-    /**
-     * 查询模板共享
-     */
-    List<CstTemplateShare> selectTemplateShares(String templateId);
-
-    /**
-     * 删除模板共享
-     */
-    int deleteTemplateShares(String templateId);
-
-    /**
-     * 插入模板共享
-     */
-    void insertTemplateShares(List<CstTemplateShare> shares);
-
-    /**
-     * 查询数据表
-     */
-    List<CstTable> selectTables();
-
-    /**
-     * 查询数据表对象
-     */
-    CstTable selectTable(String tableId);
-
-    /**
-     * 查询关联表
-     */
-    List<CstTable> selectRelateTables(String tableId);
-
-    /**
-     * 查询数据表指标列表
-     */
-    List<CstTableIndicator> selectTableIndicators(String tableId);
-
-    /**
-     * 查询数据表指标
-     */
-    CstTableIndicator selectTableIndicator(String id);
-
-    /**
-     * 查询查询类型
-     */
-    List<CstQueryType> selectQueryTypes();
-
-    /**
-     * 查询数据表关联
-     */
-    List<CstTableRelation> selectTableRelations(List<String> mainTableIds);
-
-    /**
-     * 查询数据表关联
-     */
-    List<Map<String, Object>> search(String sql);
-
-    /**
-     * 根据报表类型查询指标
-     */
-    List<CstTableIndicator> selectByIndicators(@Param("tableType") String tableType, @Param("indicators") List<CstIndicator> indicators);
-
-    List<CstIndicator> selectIndicators(@Param("tableType") String tableType, @Param("searchField") String searchField);
-
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstDataSource.java

@@ -1,35 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("附录数据源")
-@Data
-public class CstDataSource implements Serializable {
-
-    @ApiModelProperty("数据源ID")
-    private String id;
-
-    @ApiModelProperty("数据源名称")
-    private String name;
-
-    @ApiModelProperty("附录表")
-    private String tableName;
-
-    @ApiModelProperty("值字段")
-    private String valueColumn;
-
-    @ApiModelProperty("显示字段")
-    private String labelColumn;
-
-    @ApiModelProperty("排序字段")
-    private String orderColumn;
-
-    @ApiModelProperty("过滤sql")
-    private String filterSql;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstDataType.java

@@ -1,20 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("数据类型")
-@Data
-public class CstDataType implements Serializable {
-
-    @ApiModelProperty("类型ID")
-    private String id;
-
-    @ApiModelProperty("类型名称")
-    private String name;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstDictData.java

@@ -1,16 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("附录数据")
-@Data
-public class CstDictData {
-
-    @ApiModelProperty("值")
-    private String value;
-
-    @ApiModelProperty("显示文本")
-    private String label;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstIndicator.java

@@ -1,30 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@ApiModel("数据指标")
-@Data
-public class CstIndicator implements Serializable {
-
-    @ApiModelProperty("指标ID")
-    private String id;
-
-    @ApiModelProperty("指标名称")
-    private String name;
-
-    @ApiModelProperty("计量单位")
-    private String unit;
-
-    @ApiModelProperty("选中的数据表指标ID")
-    private String tableIndicatorId;
-
-    @ApiModelProperty("数据表指标")
-    private List<CstTableIndicator> tableIndicators;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstQueryType.java

@@ -1,26 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("查询方式")
-@Data
-public class CstQueryType implements Serializable {
-
-    @ApiModelProperty("查询方式ID")
-    private String id;
-
-    @ApiModelProperty("查询方式名称")
-    private String name;
-
-    @ApiModelProperty("排序")
-    private Short orderNo;
-
-    @ApiModelProperty("数据类型ID")
-    private String dataTypeId;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstTable.java

@@ -1,26 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("数据表")
-@Data
-public class CstTable implements Serializable {
-
-    @ApiModelProperty("表代码")
-    private String id;
-
-    @ApiModelProperty("表名称")
-    private String name;
-
-    @ApiModelProperty("表类型（STATIC/DAILY/MONTH）")
-    private String tableType;
-
-    @ApiModelProperty("单位查询条件")
-    private String unitCondition;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstTableIndicator.java

@@ -1,60 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import java.io.Serializable;
-import java.util.List;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("数据表指标")
-@Data
-public class CstTableIndicator implements Serializable {
-
-    @ApiModelProperty("ID")
-    private String id;
-
-    @ApiModelProperty("指标ID")
-    private String indicatorId;
-
-    @ApiModelProperty("指标名称")
-    private String name;
-
-    @ApiModelProperty("表代码")
-    private String tableId;
-
-    @ApiModelProperty("表名称")
-    private String tableName;
-
-    @ApiModelProperty("显示字段")
-    private String labelColumn;
-
-    @ApiModelProperty("数据类型ID")
-    private String dataTypeId;
-
-    @ApiModelProperty("公式")
-    private String formula;
-
-    @ApiModelProperty("计量单位")
-    private String unit;
-
-    @ApiModelProperty("附录数据源ID")
-    private String dataSourceId;
-
-    @ApiModelProperty("值字段")
-    private String valueColumn;
-
-    @ApiModelProperty("排序")
-    private Short orderNo;
-
-    @ApiModelProperty("查询类型")
-    private String queryTypeId;
-
-    @ApiModelProperty("是否默认指标")
-    private String defaultIndicator;
-
-    @ApiModelProperty("可选查询类型")
-    private List<CstQueryType> queryTypes;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstTableRelation.java

@@ -1,26 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@ApiModel("数据表关联")
-@Data
-public class CstTableRelation implements Serializable {
-
-    @ApiModelProperty("主表ID")
-    private String mainTableId;
-
-    @ApiModelProperty("关联表ID")
-    private String relationTableId;
-
-    @ApiModelProperty("主表字段")
-    private String mainTableColumn;
-
-    @ApiModelProperty("关联表字段")
-    private String relationTableColumn;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstTemplate.java

@@ -1,43 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("模板")
-@Data
-public class CstTemplate implements Serializable {
-
-    @ApiModelProperty("ID")
-    private String id;
-
-    @ApiModelProperty("模板名称")
-    private String name;
-
-    @ApiModelProperty("单位代码")
-    private String unitcode;
-
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty("是否使用统计信息")
-    private boolean useGroup;
-
-    @ApiModelProperty("表类型")
-    private String tableType;
-
-    @ApiModelProperty("模板数据表")
-    private List<CstTemplateTable> tables;
-
-    @ApiModelProperty("数据指标")
-    private List<CstTemplateIndicator> indicators;
-
-    @ApiModelProperty("查询条件")
-    private List<CstTemplateCondition> conditions;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstTemplateCondition.java

@@ -1,38 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("模板查询条件")
-@Data
-public class CstTemplateCondition implements Serializable {
-
-    @ApiModelProperty("模板ID")
-    private String templateId;
-
-    @ApiModelProperty("指标ID")
-    private String indicatorId;
-
-    @ApiModelProperty("全局指标ID")
-    private String globalIndicatorId;
-
-    @ApiModelProperty("查询方式ID")
-    private String queryTypeId;
-
-    @ApiModelProperty("排序")
-    private Short orderNo;
-
-    @ApiModelProperty("指标名称")
-    private String indicatorName;
-
-    @ApiModelProperty("数据类型ID")
-    private String dataTypeId;
-
-    @ApiModelProperty("附录数据源ID")
-    private String dataSourceId;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstTemplateIndicator.java

@@ -1,44 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("模板指标")
-@Data
-public class CstTemplateIndicator implements Serializable {
-
-    @ApiModelProperty("ID")
-    private String id;
-
-    @ApiModelProperty("模板ID")
-    private String templateId;
-
-    @ApiModelProperty("指标ID")
-    private String indicatorId;
-
-    @ApiModelProperty("排序")
-    private Short orderNo;
-
-    @ApiModelProperty("名称")
-    private String name;
-
-    @ApiModelProperty("公式")
-    private String formula;
-
-    @ApiModelProperty("公式文本")
-    private String formulaText;
-
-    @ApiModelProperty("计量单位")
-    private String unit;
-
-    @ApiModelProperty("统计方式")
-    private String groupType;
-
-    @ApiModelProperty("指标名称")
-    private CstTableIndicator indicator;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstTemplateShare.java

@@ -1,27 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("模板共享")
-@Data
-public class CstTemplateShare implements Serializable {
-
-    public CstTemplateShare() {}
-
-    public CstTemplateShare(String templateId, String unitcode) {
-        this.templateId = templateId;
-        this.unitcode = unitcode;
-    }
-
-    @ApiModelProperty("模板ID")
-    private String templateId;
-
-    @ApiModelProperty("单位代码")
-    private String unitcode;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstTemplateShareUnit.java

@@ -1,14 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import cn.com.victorysoft.business.sys.entity.SysUnitinfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("模板共享单位")
-@Data
-public class CstTemplateShareUnit extends SysUnitinfo {
-
-    @ApiModelProperty("是否共享")
-    private boolean shared;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/entity/CstTemplateTable.java

@@ -1,26 +0,0 @@
-package cn.com.victorysoft.business.analyze.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@ApiModel("模板数据表")
-@Data
-public class CstTemplateTable implements Serializable {
-
-    @ApiModelProperty("模板ID")
-    private String templateId;
-
-    @ApiModelProperty("数据表ID")
-    private String tableId;
-
-    @ApiModelProperty("排序")
-    private Short orderNo;
-
-    @ApiModelProperty("数据表")
-    private CstTable table;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/param/CstDataSourceParam.java

@@ -1,19 +0,0 @@
-package cn.com.victorysoft.business.analyze.param;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("自定义查询数据源参数")
-@Data
-public class CstDataSourceParam {
-
-    @ApiModelProperty("数据源ID")
-    private String dataSourceId;
-
-    @ApiModelProperty("单位代码")
-    private String unitcode;
-
-    @ApiModelProperty("模糊搜索文本")
-    private String searchText;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/param/CstSearchExportParam.java

@@ -1,17 +0,0 @@
-package cn.com.victorysoft.business.analyze.param;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import net.sf.json.JSONArray;
-
-@ApiModel("自定义查询参数")
-@Data
-public class CstSearchExportParam extends CstSearchParam {
-
-    @ApiModelProperty("文件名称")
-    private String fileName = "导出文件";
-
-    @ApiModelProperty("导出表头")
-    private JSONArray columnConfig;
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/param/CstSearchParam.java

@@ -1,59 +0,0 @@
-package cn.com.victorysoft.business.analyze.param;
-
-import cn.com.victorysoft.business.sys.param.PageParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel("自定义查询参数")
-@Data
-public class CstSearchParam extends PageParam {
-
-    @ApiModelProperty("单位代码")
-    private String unitcode;
-
-    @ApiModelProperty("模板ID")
-    private String templateId;
-
-    @ApiModelProperty("是否统计")
-    private boolean useGroup;
-
-    @ApiModelProperty("查询条件")
-    private List<CstConditionValue> values;
-
-    @ApiModelProperty("统计方式")
-    private List<CstGroupSetting> groupSettings;
-
-    @ApiModel("查询条件值")
-    @Data
-    public static class CstConditionValue {
-
-        @ApiModelProperty("查询条件指标ID")
-        private String indicatorId;
-
-        @ApiModelProperty("操作符")
-        private String operator;
-
-        @ApiModelProperty("数据类型")
-        private String dataTypeId;
-
-        @ApiModelProperty(value = "查询条件值1", notes = "日期和数字转为字符串，日期格式传yyyy-MM-dd")
-        private String value1;
-
-        @ApiModelProperty(value = "查询条件值2", notes = "日期和数字转为字符串，日期格式传yyyy-MM-dd")
-        private String value2;
-    }
-
-    @ApiModel("统计设置")
-    @Data
-    public static class CstGroupSetting {
-
-        @ApiModelProperty("指标ID")
-        private String id;
-
-        @ApiModelProperty("统计方式")
-        private String groupType;
-    }
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/service/CustomSearchService.java

@@ -1,378 +0,0 @@
-package cn.com.victorysoft.business.analyze.service;
-
-import cn.com.victorysoft.business.analyze.constant.CstDataTypeEnum;
-import cn.com.victorysoft.business.analyze.constant.CstGroupType;
-import cn.com.victorysoft.business.analyze.dao.CustomSearchDao;
-import cn.com.victorysoft.business.analyze.entity.*;
-import cn.com.victorysoft.business.analyze.param.CstDataSourceParam;
-import cn.com.victorysoft.business.analyze.param.CstSearchExportParam;
-import cn.com.victorysoft.business.analyze.param.CstSearchParam;
-import cn.com.victorysoft.business.analyze.service.condition.Condition;
-import cn.com.victorysoft.business.analyze.service.condition.ConditionFactory;
-import cn.com.victorysoft.business.constant.UnitLevel;
-import cn.com.victorysoft.business.sys.entity.SysUnitinfo;
-import cn.com.victorysoft.business.sys.service.SysBaseService;
-import cn.com.victorysoft.business.util.BeanUtils;
-import cn.com.victorysoft.business.util.PageUtils;
-import cn.com.victorysoft.business.util.StringUtils;
-import cn.com.victorysoft.vseaf.core.util.IDUtils;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.DigestUtils;
-
-import javax.annotation.Resource;
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigInteger;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-public class CustomSearchService {
-
-    @Resource
-    private CustomSearchDao customSearchDao;
-
-    @Resource
-    private SysBaseService sysBaseService;
-
-    /**
-     * 查询附录数据
-     */
-    public List<CstDictData> selectDictData(CstDataSourceParam param) {
-        CstDataSource dataSource = customSearchDao.selectDataSourceById(param.getDataSourceId());
-        if (dataSource == null) return null;
-        if (StringUtils.isNotEmpty(dataSource.getFilterSql())) {
-            dataSource.setFilterSql(dataSource.getFilterSql().replaceAll("#\\{unitcode}", "'" + param.getUnitcode() + "'"));
-        }
-        PageHelper.startPage(1, 50);
-        return customSearchDao.selectDictData(dataSource, param.getSearchText());
-    }
-
-    /**
-     * 查询单位的模板列表
-     */
-    public List<CstTemplate> selectTemplates(String unitcode){
-        return customSearchDao.selectTemplates(unitcode);
-    }
-
-    /**
-     * 查询模板对象
-     */
-    public CstTemplate selectTemplate(String id){
-        CstTemplate template = customSearchDao.selectTemplate(id);
-        List<CstTemplateTable> tables = customSearchDao.selectTemplateTables(id);
-        List<CstTemplateIndicator> indicators = customSearchDao.selectTemplateIndicators(id);
-        List<CstTemplateCondition> conditions = customSearchDao.selectTemplateConditions(id);
-        template.setTables(tables);
-        template.setIndicators(indicators);
-        template.setConditions(conditions);
-        return template;
-    }
-
-    /**
-     * 新增模板对象
-     */
-    @Transactional
-    public void insertTemplate(CstTemplate template){
-        template.setId(IDUtils.getUUID32());
-        template.setUpdateTime(new Date());
-        customSearchDao.insertTemplate(template);
-        this.insertTemplateData(template);
-    }
-
-    /**
-     * 更新模板对象
-     */
-    @Transactional
-    public void updateTemplate(CstTemplate template){
-        customSearchDao.updateTemplate(template);
-        customSearchDao.deleteTemplateTables(template.getId());
-        customSearchDao.deleteTemplateIndicators(template.getId());
-        customSearchDao.deleteTemplateConditions(template.getId());
-        this.insertTemplateData(template);
-    }
-
-    /**
-     * 插入模板数据
-     */
-    @Transactional
-    public void insertTemplateData(CstTemplate template) {
-        template.getTables().forEach(item -> item.setTemplateId(template.getId()));
-        customSearchDao.insertTemplateTables(template.getTables());
-        template.getIndicators().forEach(item -> {
-            item.setTemplateId(template.getId());
-            item.setId(this.generateId());
-        });
-        customSearchDao.insertTemplateIndicators(template.getIndicators());
-        if (template.getConditions().size() > 0) {
-            template.getConditions().forEach(item -> item.setTemplateId(template.getId()));
-            customSearchDao.insertTemplateConditions(template.getConditions());
-        }
-    }
-
-    /**
-     * 生成模板指标的ID，查询时作为查询字段名，因为Oracle限制字段名最大长度为30，所以将16进制转为32进制，较短
-     */
-    private String generateId() {
-        BigInteger i = new BigInteger(IDUtils.getUUID32(), 16);
-        return "A" + i.toString(32).toUpperCase();
-    }
-
-    /**
-     * 删除模板对象
-     */
-    @Transactional
-    public void deleteTemplate(String templateId){
-        customSearchDao.deleteTemplateTables(templateId);
-        customSearchDao.deleteTemplateIndicators(templateId);
-        customSearchDao.deleteTemplateConditions(templateId);
-        customSearchDao.deleteTemplateShares(templateId);
-        customSearchDao.deleteTemplate(templateId);
-    }
-
-    /**
-     * 共享模板对象
-     */
-    @Transactional
-    public void shareTemplate(String templateId, String[] unitcodes){
-        customSearchDao.deleteTemplateShares(templateId);
-        List<CstTemplateShare> shares = Arrays.stream(unitcodes).map(item -> new CstTemplateShare(templateId, item))
-                .collect(Collectors.toList());
-        customSearchDao.insertTemplateShares(shares);
-    }
-
-    /**
-     * 查询共享单位
-     */
-    public CstTemplateShareUnit selectShareUnits(String templateId){
-        CstTemplate template = customSearchDao.selectTemplate(templateId);
-        if (template == null) return null;
-        String unitcode = template.getUnitcode();
-        SysUnitinfo unitinfo = sysBaseService.selectUnitByCode(unitcode);
-        int level = unitinfo.getUnitlevel().intValue();
-        String rootUnitCode = unitcode;
-        // 管理区用户可共享到厂
-        if (UnitLevel.AREA_LEVEL == level) {
-            rootUnitCode = unitinfo.getPUnitcode();
-        }
-        List<SysUnitinfo> unitList = null;
-        if (UnitLevel.COMPANY_LEVEL == level || UnitLevel.AREA_LEVEL == level) {
-            unitList = sysBaseService.selectUnitNodeListLevel3(rootUnitCode);
-        }else if (UnitLevel.GROUP_LEVEL == level) {
-            unitList = sysBaseService.selectUnitNodeListLevel2(rootUnitCode);
-        }
-        if (unitList == null) return null;
-        // 查询模板共享单位
-        List<CstTemplateShare> shares = customSearchDao.selectTemplateShares(templateId);
-        Set<String> unitCodeSet = shares.stream().map(CstTemplateShare::getUnitcode).collect(Collectors.toSet());
-        List<CstTemplateShareUnit> shareUnits = unitList.stream().map(item -> {
-            CstTemplateShareUnit shareUnit = new CstTemplateShareUnit();
-            try {
-                BeanUtils.copyProperties(shareUnit, item);
-                shareUnit.setShared(unitCodeSet.contains(item.getUnitcode()));
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                e.printStackTrace();
-            }
-            return shareUnit;
-        }).collect(Collectors.toList());
-        return (CstTemplateShareUnit) sysBaseService.buildUnitTree(shareUnits);
-    }
-
-    /**
-     * 查询数据表
-     */
-    public List<CstTable> selectTables() {
-        return customSearchDao.selectTables();
-    }
-
-    /**
-     * 查询关联表
-     */
-    public List<CstTable> selectRelateTables(String tableId) {
-        return customSearchDao.selectRelateTables(tableId);
-    }
-
-    /**
-     * 查询数据表指标
-     */
-    public List<CstTableIndicator> selectTableIndicators(String tableId) {
-        // 查询查询类型
-        List<CstQueryType> queryTypes = customSearchDao.selectQueryTypes();
-        Map<String, List<CstQueryType>> queryTypeMap = queryTypes.stream().collect(Collectors.groupingBy(CstQueryType::getDataTypeId));
-        // 查询指标
-        List<CstTableIndicator> indicators = customSearchDao.selectTableIndicators(tableId);
-        // 设置指标的查询方式列表
-        indicators.forEach(item -> {
-            item.setQueryTypes(queryTypeMap.get(item.getDataTypeId()));
-            if (StringUtils.isEmpty(item.getQueryTypeId()) && item.getQueryTypes() != null) {
-                item.setQueryTypeId(item.getQueryTypes().get(0).getDataTypeId());
-            }
-        });
-        return indicators;
-    }
-
-    /**
-     * 根据报表类型查询指标
-     */
-    public PageInfo<CstIndicator> selectIndicators(String tableType, Integer pageNum, Integer pageSize, String searchField) {
-        PageHelper.startPage(pageNum, pageSize);
-        // 根据tableType查询CstIndicator
-        List<CstIndicator> result = customSearchDao.selectIndicators(tableType, searchField);
-        // 有对应数据表时才去查询指标
-        if (result.size() > 0) {
-            // 根据result查询CstTableIndicator
-            List<CstTableIndicator> tableIndicators = customSearchDao.selectByIndicators(tableType, result);
-
-            for (CstTableIndicator tableIndicator : tableIndicators) {
-                CstIndicator indicator = null;
-                for (CstIndicator ci : result) {
-                    if (ci.getId().equals(tableIndicator.getIndicatorId())) {
-                        indicator = ci;
-                        break;
-                    }
-                }
-                if (indicator == null) {
-                    indicator = new CstIndicator();
-                    indicator.setId(tableIndicator.getIndicatorId());
-                    indicator.setName(tableIndicator.getName());
-                    indicator.setUnit(tableIndicator.getUnit());
-                    indicator.setTableIndicatorId(tableIndicator.getId());
-                    indicator.setTableIndicators(new ArrayList<>());
-                    result.add(indicator);
-                }else if (indicator.getTableIndicators() == null) {
-                    indicator.setTableIndicatorId(tableIndicator.getId());
-                    indicator.setTableIndicators(new ArrayList<>());
-                }
-                indicator.getTableIndicators().add(tableIndicator);
-            }
-        }
-
-        return new PageInfo<>(result);
-    }
-
-    /**
-     * 查询数据
-     */
-    public List<Map<String, Object>> searchList(CstSearchParam param, boolean page) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("with unitcodes as (select unitcode from sys_unitinfo start with unitcode = '");
-        sb.append(param.getUnitcode());
-        sb.append("' connect by prior unitcode = p_unitcode) ");
-        sb.append("select ");
-        String templateId = param.getTemplateId();
-        // 查询模板数据表
-        List<CstTemplateTable> templateTables = customSearchDao.selectTemplateTables(templateId);
-        // 查询模板字段
-        List<CstTemplateIndicator> templateIndicators = customSearchDao.selectTemplateIndicators(templateId);
-        // 拼接查询字段
-        for (int i = 0; i < templateIndicators.size(); i++) {
-            CstTemplateIndicator templateIndicator = templateIndicators.get(i);
-            if (i != 0) {
-                sb.append(",");
-            }
-            // 自定义参数
-            if (StringUtils.isEmpty(templateIndicator.getIndicatorId())) {
-                sb.append(templateIndicator.getFormula());
-            }
-            // 数据表参数
-            else {
-                CstTableIndicator indicator = templateIndicator.getIndicator();
-                if (StringUtils.isNotEmpty(indicator.getFormula())) {
-                    sb.append(indicator.getFormula());
-                }else {
-                    sb.append(indicator.getTableId()).append(".").append(indicator.getLabelColumn());
-                }
-            }
-
-            // ID作为别名
-            sb.append(" as ").append(templateIndicator.getId());
-        }
-        sb.append(" from ");
-        List<String> tableIds = templateTables.stream().map(CstTemplateTable::getTableId).collect(Collectors.toList());
-        sb.append(String.join(",", tableIds)).append(" where 1 = 1 ");
-        // 拼接关联表的单位代码条件
-        if (!"30200000".equals(param.getUnitcode())) {
-            for (CstTemplateTable templateTable : templateTables) {
-                CstTable table = templateTable.getTable();
-                if (StringUtils.isNotEmpty(table.getUnitCondition())) {
-                    sb.append(" and ").append(table.getId()).append(".");
-                    sb.append(table.getUnitCondition());
-                }
-            }
-        }
-        // 拼接关联SQL
-        List<CstTableRelation> tableRelations = customSearchDao.selectTableRelations(tableIds);
-        for (CstTableRelation relation : tableRelations) {
-            sb.append(" and ").append(relation.getMainTableId()).append(".").append(relation.getMainTableColumn())
-                    .append(" = ").append(relation.getRelationTableId()).append(".").append(relation.getRelationTableColumn());
-        }
-        // 拼接查询条件
-        List<CstSearchParam.CstConditionValue> values = param.getValues();
-        if (values != null && values.size() > 0) {
-            for (CstSearchParam.CstConditionValue value : values) {
-                // 查询指标
-                CstTableIndicator indicator = customSearchDao.selectTableIndicator(value.getIndicatorId());
-                Condition con = ConditionFactory.get(CstDataTypeEnum.valueOf(indicator.getDataTypeId()), value.getOperator());
-                if (con != null) {
-                    String sql = con.buildSql(indicator, value.getValue1(), value.getValue2());
-                    if (StringUtils.isNotEmpty(sql)) {
-                        sb.append(sql);
-                    }
-                }
-            }
-        }
-        String sql = sb.toString();
-        log.info("自定义查询SQL：{}", sql);
-        if (page) {
-            PageUtils.startPage(param);
-        }
-        List<Map<String, Object>> result = customSearchDao.search(sql);
-        for (int i = 0; i < result.size(); i++) {
-            result.get(i).put("index", (param.getPageNum() - 1) * param.getPageSize() + i + 1);
-        }
-
-        // 使用统计信息
-        if (param.isUseGroup() && param.getPageNum() == 1) {
-            boolean haveGroupType = false;
-            sb = new StringBuilder("select ");
-            for (CstSearchParam.CstGroupSetting groupSetting : param.getGroupSettings()) {
-                String groupType = groupSetting.getGroupType();
-                boolean isNumber = CstGroupType.SUM.equals(groupType) || CstGroupType.AVG.equals(groupType);
-                if (StringUtils.isNotEmpty(groupType)) {
-                    haveGroupType = true;
-                    if (isNumber) sb.append("round(");
-                    sb.append(groupType).append("(t.").append(groupSetting.getId()).append(")");
-                    if (isNumber) sb.append(",2)");
-                    sb.append(" as ").append(groupSetting.getId()).append(",");
-                }
-            }
-            if (haveGroupType) {
-                sb.deleteCharAt(sb.length() - 1);
-                sb.append(" from (").append(sql).append(") t");
-            }
-            sql = sb.toString();
-            List<Map<String, Object>> groupResults = customSearchDao.search(sql);
-            if (groupResults.size() > 0) {
-                Map<String, Object> groupResult = groupResults.get(0);
-                if (groupResult != null) {
-                    groupResult.put("index", "统计");
-                    result.add(0, groupResult);
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * 查询数据
-     */
-    public PageInfo<Map<String, Object>> search(CstSearchParam param) {
-        List<Map<String, Object>> result = this.searchList(param, true);
-        return new PageInfo<>(result);
-    }
-
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/service/condition/Condition.java

@@ -1,17 +0,0 @@
-package cn.com.victorysoft.business.analyze.service.condition;
-
-import cn.com.victorysoft.business.analyze.entity.CstTableIndicator;
-
-/**
- * 条件接口
- */
-public interface Condition {
-
-    /**
-     * 构建SQL
-     * @param indicator 指标
-     * @param value 查询值，最多有2个
-     * @return 查询条件SQL
-     */
-    String buildSql(CstTableIndicator indicator, String... value);
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/service/condition/ConditionFactory.java

@@ -1,20 +0,0 @@
-package cn.com.victorysoft.business.analyze.service.condition;
-
-import cn.com.victorysoft.business.analyze.constant.CstDataTypeEnum;
-
-public class ConditionFactory {
-
-    public static Condition get(CstDataTypeEnum dataType, String operator) {
-        if (dataType == CstDataTypeEnum.DATE) {
-            return new DateCondition();
-        }else if (dataType == CstDataTypeEnum.DICT) {
-            return new DictCondition();
-        }else if (dataType == CstDataTypeEnum.NUMBER) {
-            return new NumberCondition(operator);
-        }else if (dataType == CstDataTypeEnum.VARCHAR) {
-            return new VarcharCondition(operator);
-        }else {
-            return null;
-        }
-    }
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/service/condition/DateCondition.java

@@ -1,25 +0,0 @@
-package cn.com.victorysoft.business.analyze.service.condition;
-
-import cn.com.victorysoft.business.analyze.entity.CstTableIndicator;
-import cn.com.victorysoft.business.util.StringUtils;
-
-/**
- * 日期-范围选择类型
- */
-public class DateCondition implements Condition {
-    @Override
-    public String buildSql(CstTableIndicator indicator, String... value) {
-        String value1 = value[0];
-        String value2 = value[1];
-        String sql = "";
-        if (StringUtils.isNotEmpty(value1)) {
-            String column = indicator.getLabelColumn();
-            sql += " and " + indicator.getTableId() + "." + column + " >= to_date('" + value1 + "', 'yyyy-mm-dd')";
-        }
-        if (StringUtils.isNotEmpty(value2)) {
-            String column = indicator.getLabelColumn();
-            sql += " and " + indicator.getTableId() + "." + column + " < to_date('" + value2 + "', 'yyyy-mm-dd') + 1";
-        }
-        return "".equals(sql) ? null : sql;
-    }
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/service/condition/DictCondition.java

@@ -1,18 +0,0 @@
-package cn.com.victorysoft.business.analyze.service.condition;
-
-import cn.com.victorysoft.business.analyze.entity.CstTableIndicator;
-import cn.com.victorysoft.business.util.StringUtils;
-
-/**
- * 字典-下拉选择类型
- */
-public class DictCondition implements Condition {
-    @Override
-    public String buildSql(CstTableIndicator indicator, String... value) {
-        String value1 = value[0];
-        if (StringUtils.isNotEmpty(value1)) {
-            return " and " + indicator.getTableId() + "." + indicator.getValueColumn() + " = '" + value[0] + "'";
-        }
-        return null;
-    }
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/service/condition/NumberCondition.java

@@ -1,53 +0,0 @@
-package cn.com.victorysoft.business.analyze.service.condition;
-
-import cn.com.victorysoft.business.analyze.constant.CstOperator;
-import cn.com.victorysoft.business.analyze.entity.CstTableIndicator;
-import cn.com.victorysoft.business.util.StringUtils;
-
-/**
- * 数字-范围录入类型
- */
-public class NumberCondition implements Condition {
-    private String operator;
-    public NumberCondition(String operator) {
-        this.operator = operator;
-    }
-    @Override
-    public String buildSql(CstTableIndicator indicator, String... value) {
-        if (StringUtils.isEmpty(operator)) return null;
-        String value1 = value[0];
-        String value2 = value[1];
-        String sql = "";
-        String column = indicator.getLabelColumn();
-        if (operator.equals(CstOperator.EQUAL) && StringUtils.isNotEmpty(value1)) {
-            sql += " and " + indicator.getTableId() + "." + column + " = to_number('" + value1 + "')";
-        }
-        if (operator.equals(CstOperator.NOT_EQUAL) && StringUtils.isNotEmpty(value1)) {
-            sql += " and " + indicator.getTableId() + "." + column + " != to_number('" + value1 + "')";
-        }
-        if (operator.equals(CstOperator.LT) && StringUtils.isNotEmpty(value1)) {
-            sql += " and " + indicator.getTableId() + "." + column + " < to_number('" + value1 + "')";
-        }
-        if (operator.equals(CstOperator.LTE) && StringUtils.isNotEmpty(value1)) {
-            sql += " and " + indicator.getTableId() + "." + column + " <= to_number('" + value1 + "')";
-        }
-        if (operator.equals(CstOperator.GT) && StringUtils.isNotEmpty(value1)) {
-            sql += " and " + indicator.getTableId() + "." + column + " > to_number('" + value1 + "')";
-        }
-        if (operator.equals(CstOperator.GTE) && StringUtils.isNotEmpty(value1)) {
-            sql += " and " + indicator.getTableId() + "." + column + " >= to_number('" + value1 + "')";
-        }
-        if (operator.equals(CstOperator.BETWEEN) && StringUtils.isNotEmpty(value1) && StringUtils.isNotEmpty(value2)) {
-            sql += " and " + indicator.getTableId() + "." + column + " >= to_number('" + value1 + "')";
-            sql += " and " + indicator.getTableId() + "." + column + " <= to_number('" + value2 + "')";
-        }
-        if (operator.equals(CstOperator.NULL)) {
-            sql += " and " + indicator.getTableId() + "." + column + " is null";
-        }
-        if (operator.equals(CstOperator.NOT_NULL)) {
-            sql += " and " + indicator.getTableId() + "." + column + " is not null";
-        }
-
-        return "".equals(sql) ? null : sql;
-    }
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/analyze/service/condition/VarcharCondition.java

@@ -1,41 +0,0 @@
-package cn.com.victorysoft.business.analyze.service.condition;
-
-import cn.com.victorysoft.business.analyze.constant.CstOperator;
-import cn.com.victorysoft.business.analyze.entity.CstTableIndicator;
-import cn.com.victorysoft.business.util.StringUtils;
-
-/**
- * 字符-模糊匹配类型
- */
-public class VarcharCondition implements Condition {
-    private String operator;
-    public VarcharCondition(String operator) {
-        this.operator = operator;
-    }
-    @Override
-    public String buildSql(CstTableIndicator indicator, String... value) {
-        if (StringUtils.isEmpty(operator)) return null;
-        String value1 = value[0];
-        String sql = "";
-        String column = indicator.getLabelColumn();
-        if (operator.equals(CstOperator.EQUAL) && StringUtils.isNotEmpty(value1)) {
-            sql += " and " + indicator.getTableId() + "." + column + " = '" + value1 + "'";
-        }
-        if (operator.equals(CstOperator.NOT_EQUAL) && StringUtils.isNotEmpty(value1)) {
-            sql += " and " + indicator.getTableId() + "." + column + " != '" + value1 + "'";
-        }
-        if (operator.equals(CstOperator.LIKE) && StringUtils.isNotEmpty(value1)) {
-            sql += " and " + indicator.getTableId() + "." + column + " like '%" + value1 + "%'";
-        }
-        if (operator.equals(CstOperator.NOT_LIKE) && StringUtils.isNotEmpty(value1)) {
-            sql += " and " + indicator.getTableId() + "." + column + " not like '%" + value1 + "%'";
-        }
-        if (operator.equals(CstOperator.NULL)) {
-            sql += " and " + indicator.getTableId() + "." + column + " is null";
-        }
-        if (operator.equals(CstOperator.NOT_NULL)) {
-            sql += " and " + indicator.getTableId() + "." + column + " is not null";
-        }
-        return "".equals(sql) ? null : sql;
-    }
-}

vseaf4.4-analyze/src/main/java/cn/com/victorysoft/business/readme.md

@@ -1,3 +0,0 @@
-# vseaf4.4-analyze 综合分析优化
-
-* 修改及新建package时，必须以`cn.com.victorysoft.business.{项目名}`为前缀。

vseaf4.4-analyze/src/main/resources/mapper/CustomSearchDao.xml

@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.victorysoft.business.analyze.dao.CustomSearchDao">
-  <select id="selectDataSourceById" parameterType="String" resultType="CstDataSource">
-    select id, name, table_name, value_column, label_column, order_column, filter_sql
-    from cst_data_source
-    where id = #{value}
-  </select>
-
-  <select id="selectDictData" parameterType="CstDataSource" resultType="CstDictData">
-    select ${dataSource.valueColumn} as "value",
-      ${dataSource.labelColumn} as label
-    from ${dataSource.tableName}
-    where 1 = 1
-    <if test="searchText != null and searchText != ''">
-      and ${dataSource.labelColumn} like '%'||#{searchText}||'%'
-    </if>
-    <if test="dataSource.filterSql != null and dataSource.filterSql != ''">
-      and ${dataSource.filterSql}
-    </if>
-    <if test="dataSource.orderColumn != null and dataSource.orderColumn != ''">
-      order by ${dataSource.orderColumn}
-    </if>
-  </select>
-
-  <select id="selectTemplates" parameterType="String" resultType="CstTemplate">
-    select id, name, unitcode, update_time, use_group, table_type
-    from cst_template
-    where unitcode = #{value}
-    or id in (select template_id from cst_template_share where unitcode = #{value})
-    order by name
-  </select>
-
-  <select id="selectTemplate" parameterType="String" resultType="CstTemplate">
-    select id, name, unitcode, update_time, use_group, table_type
-    from cst_template
-    where id = #{value}
-  </select>
-
-  <delete id="deleteTemplate" parameterType="String">
-    delete from cst_template where id = #{value}
-  </delete>
-
-  <insert id="insertTemplate" parameterType="CstTemplate">
-    insert into cst_template
-      (id, name, unitcode, update_time, use_group, table_type)
-    values
-      (#{id}, #{name}, #{unitcode}, sysdate, #{useGroup}, #{tableType})
-  </insert>
-
-  <update id="updateTemplate" parameterType="CstTemplate">
-    update cst_template
-     set name = #{name},
-         unitcode = #{unitcode},
-         use_group = #{useGroup},
-         table_type = #{tableType},
-         update_time = sysdate
-    where id = #{id}
-  </update>
-
-  <select id="selectTemplateTables" parameterType="String" resultType="CstTemplateTable">
-    select ctt.template_id, ctt.table_id, ctt.order_no,
-    ct.id "table.id", ct.name "table.name", ct.table_type "table.table_type", ct.unit_condition "table.unit_condition"
-    from cst_template_table ctt, cst_table ct
-    where ctt.table_id = ct.id
-    and ctt.template_id = #{value}
-    order by order_no
-  </select>
-
-  <delete id="deleteTemplateTables" parameterType="String">
-    delete from cst_template_table where template_id = #{value}
-  </delete>
-
-  <insert id="insertTemplateTables" parameterType="java.util.List">
-    insert into cst_template_table (template_id, table_id, order_no)
-    <foreach collection="list" item="item" separator="UNION ALL">
-      SELECT #{item.templateId}, #{item.tableId}, #{item.orderNo}
-      FROM dual
-    </foreach>
-  </insert>
-
-  <select id="selectTemplateIndicators" parameterType="String" resultType="CstTemplateIndicator">
-    select cti.id,
-           cti.name,
-           cti.template_id,
-           cti.indicator_id,
-           cti.formula,
-           cti.formula_text,
-           cti.unit,
-           cti.order_no,
-           cti.group_type,
-           ci.id "indicator.id",
-           ci.name "indicator.name",
-           ci.table_id "indicator.table_id",
-           ci.label_column "indicator.label_column",
-           ci.data_type_id "indicator.data_type_id",
-           ci.formula "indicator.formula",
-           ci.unit "indicator.unit",
-           ci.data_source_id "indicator.data_source_id",
-           ci.value_column "indicator.value_column",
-           ci.order_no "indicator.order_no",
-           ci.query_type_id "indicator.query_type_id",
-           ci.indicator_id "indicator.indicator_id"
-      from cst_template_indicator cti, cst_table_indicator ci
-     where cti.indicator_id = ci.id(+)
-       and cti.template_id = #{value}
-     order by cti.order_no
-  </select>
-
-  <delete id="deleteTemplateIndicators" parameterType="String">
-    delete from cst_template_indicator where template_id = #{value}
-  </delete>
-
-  <insert id="insertTemplateIndicators" parameterType="java.util.List">
-    insert into cst_template_indicator (template_id, indicator_id, order_no, id, name, formula, formula_text, unit, group_type)
-    <foreach collection="list" item="item" separator="UNION ALL">
-      SELECT #{item.templateId}, #{item.indicatorId,jdbcType=VARCHAR}, #{item.orderNo}, #{item.id}, #{item.name,jdbcType=VARCHAR},
-       #{item.formula,jdbcType=VARCHAR}, #{item.formulaText,jdbcType=VARCHAR}, #{item.unit,jdbcType=VARCHAR}, #{item.groupType,jdbcType=VARCHAR}
-      FROM dual
-    </foreach>
-  </insert>
-
-  <select id="selectTemplateConditions" parameterType="String" resultType="CstTemplateCondition">
-    select ctc.template_id, ctc.indicator_id, ctc.query_type_id, ctc.order_no,
-      ci.name indicatorName, cti.data_type_id, cti.data_source_id, ci.id global_indicator_id
-    from cst_template_condition ctc, cst_table_indicator cti, cst_indicator ci
-    where  ctc.indicator_id = cti.id
-    and cti.indicator_id = ci.id
-    and template_id = #{value}
-    order by ctc.order_no
-  </select>
-
-  <select id="selectTemplateCondition" resultType="CstTemplateCondition">
-    select ctc.template_id, ctc.indicator_id, ctc.query_type_id, ctc.order_no,
-      ci.name indicatorName, cti.data_type_id, cti.data_source_id, ci.id global_indicator_id
-    from cst_template_condition ctc, cst_table_indicator cti, cst_indicator ci
-    where  ctc.indicator_id = cti.id
-    and cti.indicator_id = ci.id
-    and template_id = #{templateId}
-    and ctc.indicator_id = #{indicatorId}
-  </select>
-
-  <delete id="deleteTemplateConditions" parameterType="String">
-    delete from cst_template_condition where template_id = #{value}
-  </delete>
-
-  <insert id="insertTemplateConditions" parameterType="java.util.List">
-    insert into cst_template_condition (template_id, indicator_id, query_type_id, order_no)
-    <foreach collection="list" item="item" separator="UNION ALL">
-      SELECT #{item.templateId}, #{item.indicatorId}, #{item.queryTypeId,jdbcType=VARCHAR}, #{item.orderNo}
-      FROM dual
-    </foreach>
-  </insert>
-
-  <select id="selectTemplateShares" parameterType="String" resultType="CstTemplateShare">
-    select template_id, unitcode
-    from cst_template_share
-    where template_id = #{value}
-  </select>
-
-  <delete id="deleteTemplateShares" parameterType="String">
-    delete from cst_template_share where template_id = #{value}
-  </delete>
-
-  <insert id="insertTemplateShares" parameterType="java.util.List">
-    insert into cst_template_share  (template_id, unitcode)
-    <foreach collection="list" item="item" separator="UNION ALL">
-      SELECT #{item.templateId}, #{item.unitcode}
-      FROM dual
-    </foreach>
-  </insert>
-
-  <select id="selectTables" resultType="CstTable">
-    select id, name, table_type, unit_condition
-    from cst_table
-    order by name
-  </select>
-
-  <select id="selectTable" parameterType="String" resultType="CstTable">
-    select id, name, table_type, unit_condition
-    from cst_table
-    where id = #{value}
-  </select>
-
-  <select id="selectRelateTables" parameterType="String" resultType="CstTable">
-    select id, name, table_type, unit_condition
-    from cst_table
-    where id in
-    (select relation_table_id from cst_table_relation where main_table_id = #{value})
-    order by name
-  </select>
-
-  <select id="selectTableIndicators" parameterType="String" resultType="CstTableIndicator">
-    select id, name, table_id, label_column, data_type_id, formula, unit, data_source_id, value_column,
-    order_no, query_type_id, default_indicator, indicator_id
-    from cst_table_indicator
-    where table_id = #{value}
-    order by order_no
-  </select>
-
-  <select id="selectTableIndicator" parameterType="String" resultType="CstTableIndicator">
-    select id, name, table_id, label_column, data_type_id, formula, unit, data_source_id, value_column,
-    order_no, query_type_id, default_indicator, indicator_id
-    from cst_table_indicator
-    where id = #{value}
-  </select>
-
-  <select id="selectQueryTypes" resultType="CstQueryType">
-    select cdt.id data_type_id, cqt.id, cqt.name, cdtqt.order_no
-      from cst_data_type            cdt,
-           cst_data_type_query_type cdtqt,
-           cst_query_type           cqt
-    where cdt.id = cdtqt.data_type_id
-      and cqt.id = cdtqt.query_type_id
-    order by cdt.id, cdtqt.order_no
-  </select>
-
-  <select id="selectTableRelations" parameterType="java.util.List" resultType="CstTableRelation">
-    select main_table_id, relation_table_id, main_table_column, relation_table_column
-      from cst_table_relation
-    where main_table_id in
-    <foreach collection="list" item = "code" open="(" separator="," close=")" index="index">
-      #{code}
-    </foreach>
-    and relation_table_id in
-    <foreach collection="list" item = "code" open="(" separator="," close=")" index="index">
-      #{code}
-    </foreach>
-  </select>
-
-  <select id="search" parameterType="String" resultType="Map">
-    ${value}
-  </select>
-
-  <select id="selectIndicators" resultType="CstIndicator">
-    select distinct ci.*
-    from cst_table_indicator cti, cst_table ct, cst_indicator ci
-    where cti.table_id = ct.id and cti.indicator_id = ci.id
-    and (ct.table_type = #{tableType} or ct.table_type = 'STATIC')
-    <if test="searchField != null and searchField != ''">
-      and ci.name like '%'||#{searchField}||'%'
-    </if>
-    order by
-    <if test="searchField != null and searchField != ''">
-      length(replace(ci.name, #{searchField}, '')) nulls first,
-    </if>
-    nlssort(ci.name, 'NLS_SORT=SCHINESE_PINYIN_M')
-  </select>
-
-  <select id="selectByIndicators" resultType="CstTableIndicator">
-    select cti.id, ci.name, table_id, label_column, data_type_id, formula, ci.unit, data_source_id,
-    value_column, order_no, query_type_id, default_indicator, indicator_id, ct.name table_name
-    from cst_table_indicator cti, cst_table ct, cst_indicator ci
-    where cti.table_id = ct.id and cti.indicator_id = ci.id
-    and (ct.table_type = #{tableType} or ct.table_type = 'STATIC')
-    and ci.id in
-    <foreach collection="indicators" item = "item" open="(" separator="," close=")" index="index">
-      #{item.id}
-    </foreach>
-    order by nlssort(ci.name, 'NLS_SORT=SCHINESE_PINYIN_M'), cti.default_indicator desc nulls last
-  </select>
-</mapper>

vseaf4.4-analyze/src/test/java/cn/com/victorysoft/analyze/Test.java

@@ -1,40 +0,0 @@
-package cn.com.victorysoft.analyze;
-
-import cn.com.victorysoft.business.analyze.constant.CstDataTypeEnum;
-
-import java.math.BigInteger;
-
-public class Test {
-    public static void main(String[] args) {
-        String[] ary = {"B0D4B6C7E1EE1354E053040011AC417F",
-                "B0D4B6C7E1D81354E053040011AC417F",
-                "B0D4B6C7E1D91354E053040011AC417F",
-                "B0D4B6C7E1DA1354E053040011AC417F",
-                "B0D4B6C7E1DB1354E053040011AC417F",
-                "B0D4B6C7E1DC1354E053040011AC417F",
-                "B0D4B6C7E1DD1354E053040011AC417F",
-                "B0D4B6C7E1DE1354E053040011AC417F",
-                "B0D4B6C7E1DF1354E053040011AC417F",
-                "B0D4B6C7E1E01354E053040011AC417F",
-                "B0D4B6C7E1E11354E053040011AC417F",
-                "B0D4B6C7E1E21354E053040011AC417F",
-                "B0D4B6C7E1E31354E053040011AC417F",
-                "B0D4B6C7E1E41354E053040011AC417F",
-                "B0D4B6C7E1E51354E053040011AC417F",
-                "B0D4B6C7E1E61354E053040011AC417F",
-                "B0D4B6C7E1E71354E053040011AC417F",
-                "B0D4B6C7E1E81354E053040011AC417F",
-                "B0D4B6C7E1E91354E053040011AC417F",
-                "B0D4B6C7E1EA1354E053040011AC417F",
-                "B0D4B6C7E1EB1354E053040011AC417F",
-                "B0D4B6C7E1EC1354E053040011AC417F",
-                "B0D4B6C7E1ED1354E053040011AC417F",
-                "B0D4B6C7E1E91354E053040011AC1823"};
-        for (String s : ary) {
-            BigInteger i = new BigInteger(s, 16);
-            System.out.println("A" + i.toString(32).toUpperCase());
-        }
-
-        System.out.println(CstDataTypeEnum.valueOf(""));
-    }
-}

vseaf4.4-analyze/src/test/java/cn/com/victorysoft/redme.txt

@@ -1 +0,0 @@
-单元测试

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/controller/DataCalcController.java

@@ -1,196 +0,0 @@
-package cn.com.victorysoft.business.calc.controller;
-
-import cn.com.victorysoft.business.calc.service.*;
-import cn.com.victorysoft.business.calc.task.DataSyncTask;
-import cn.com.victorysoft.business.indicator.entity.WellSectionMonth;
-import cn.com.victorysoft.business.indicator.param.SectionRateWellExportParam;
-import cn.com.victorysoft.business.indicator.param.WellSectionMonthParam;
-import cn.com.victorysoft.business.indicator.service.LessSummaryService;
-import cn.com.victorysoft.business.indicator.service.MoreSummaryService;
-import cn.com.victorysoft.business.indicator.service.SectionRateSummaryService;
-import cn.com.victorysoft.business.sys.entity.DateRange;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.sys.param.UnitDateRangeParam;
-import cn.com.victorysoft.business.util.DateUtils;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-@Api(tags = "计算服务")
-@Slf4j
-@RestController
-@RequestMapping("calc")
-public class DataCalcController {
-    @Resource
-    private DataSyncService dataSyncService;
-    @Resource
-    private QualityDataSyncService qualityDataSyncService;
-    @Resource
-    private FlushDataSyncService flushDataSyncService;
-    @Resource
-    private AdjustDataSyncService adjustDataSyncService;
-    @Resource
-    private AbnormalDataSyncService abnormalDataSyncService;
-    @Resource
-    private ConditionDataSyncService conditionDataSyncService;
-    @Resource
-    private RealtimeService realtimeService;
-    @Resource
-    private SectionRateSummaryService sectionRateSummaryService;
-    @Resource
-    private LessSummaryService lessSummaryService;
-    @Resource
-    private MoreSummaryService moreSummaryService;
-    @Resource
-    private WellToolDataSyncService wellToolDataSyncService;
-    @Resource
-    private WellTubeDataSyncService wellTubeDataSyncService;
-
-    @PostMapping("/static")
-    @ApiOperation("静态数据")
-    public void syncStaticData(){
-        dataSyncService.syncStaticData();
-    }
-
-    @PostMapping("/daily")
-    @ApiOperation("日度数据")
-    public void daily(Date date){
-        dataSyncService.syncWellSectionDaily(date, date);
-    }
-
-    @PostMapping("/dailyRange")
-    @ApiOperation("日度阶段数据")
-    public void dailyRange(Date startDate, Date endDate) {
-        dataSyncService.syncWellSectionDaily(startDate, endDate);
-    }
-
-    @GetMapping("/wellSectionDaily")
-    @ApiOperation("计算日度时间段的层段数据")
-    public List<WellSectionMonth> wellSectionDaily(WellSectionMonthParam param){
-        return dataSyncService.calcWellSectionDaily(param);
-    }
-
-    @PostMapping("/wellSectionDaily/export")
-    @ApiOperation("导出日度时间段的层段数据")
-    public ExportResult wellSectionDailyExport(@RequestBody SectionRateWellExportParam param){
-        List<WellSectionMonth> list = dataSyncService.calcWellSectionDaily(param);
-        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
-    }
-
-    @PostMapping("/dailyRangeInjectType")
-    @ApiOperation("更新阶段注水方式数据")
-    public void dailyRangeInjectType(Date startDate, Date endDate) {
-        dataSyncService.updateInjectType(startDate, endDate);
-    }
-
-    @PostMapping("/summary")
-    @ApiOperation("汇总层段合格率")
-    public void summary(@RequestParam(required = false) String month) {
-        // 默认上月
-        if (month == null || "".equals(month)) {
-            DateRange dateRange = DateUtils.getLastMonth(new Date());
-            month = dateRange.getName();
-        }
-        // 汇总月度
-        dataSyncService.summaryWellSectionMonth(month);
-        // 计算层段合格率
-        sectionRateSummaryService.summary(month);
-        // 汇总超欠注 暂停，没有原因和措施，不能汇总
-//        lessSummaryService.summary(month);
-//        lessSummaryService.summaryMeasure(month);
-//        moreSummaryService.summary(month);
-//        moreSummaryService.summaryMeasure(month);
-    }
-
-    @PostMapping("/quality")
-    @ApiOperation("水质检测数据")
-    public void quality(Date startDate, Date endDate){
-        qualityDataSyncService.syncQualityData(startDate, endDate);
-    }
-
-    @PostMapping("/flush")
-    @ApiOperation("洗井数据")
-    public void flush(Date startDate, Date endDate){
-        flushDataSyncService.syncFlushRecord(startDate, endDate);
-    }
-
-    @PostMapping("/adjust")
-    @ApiOperation("测调数据")
-    public void adjust(Date date){
-        adjustDataSyncService.generateAdjustPlan(date);
-    }
-
-    @PostMapping("/finishAdjust")
-    @ApiOperation("完成测调数据")
-    public void finishAdjust(){
-        adjustDataSyncService.finishAdjustPlan();
-    }
-
-    @PostMapping("/abnormal")
-    @ApiOperation("异常井数据")
-    public void abnormal(Date date){
-        abnormalDataSyncService.syncAbnormalWell(date);
-        abnormalDataSyncService.summaryAbnormalUnit(date);
-    }
-
-    @PostMapping("/condition")
-    @ApiOperation("工况数据")
-    public void condition(Date date){
-        conditionDataSyncService.summary(date);
-    }
-
-    @PostMapping("/pump")
-    @ApiOperation("注水泵数据")
-    public void pump(){
-        realtimeService.syncPumpDeviceList();
-    }
-
-    @PostMapping("/wellTool")
-    @ApiOperation("井下工具数据")
-    public void wellTool(Date startDate, Date endDate){
-        wellToolDataSyncService.sync(startDate, endDate);
-    }
-
-    @PostMapping("/wellTube")
-    @ApiOperation("在井管柱数据")
-    public void wellTube(Date startDate, Date endDate){
-        wellTubeDataSyncService.sync(startDate, endDate);
-    }
-
-    @PostMapping("/summaryMonth")
-    @ApiOperation("汇总月度数据")
-    public void summaryMonth(String month){
-        dataSyncService.summaryMonth(month);
-    }
-
-    @PostMapping("/daily-all")
-    @ApiOperation("水质、洗井、异常井、单位工况")
-    public void dailyAll(Date date){
-        log.info("水质监测数据同步任务开始");
-        // 30天前
-//            qualityDataSyncService.syncQualityData(DateUtils.addDays(date, -30), date);
-        qualityDataSyncService.xchyfxSzjcsj(DateUtils.addDays(date, -30), date);
-        log.info("水质监测同步任务结束");
-
-        log.info("洗井数据同步任务开始");
-        // 2天前
-        flushDataSyncService.syncFlushRecord(DateUtils.addDays(date, -30), date);
-        log.info("洗井数据同步任务结束");
-
-        log.info("异常井数据同步任务开始");
-        abnormalDataSyncService.syncAbnormalWell(date);
-        abnormalDataSyncService.summaryAbnormalUnit(date);
-        log.info("异常井数据同步任务结束");
-
-        log.info("单位工况数据汇总任务开始");
-        conditionDataSyncService.summary(date);
-        log.info("单位工况数据汇总任务结束");
-    }
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/controller/IndexController.java

@@ -1,46 +0,0 @@
-package cn.com.victorysoft.business.calc.controller;
-
-import cn.com.victorysoft.business.calc.dto.IndexUnitMonthDto;
-import cn.com.victorysoft.business.calc.entity.UnitDaily;
-import cn.com.victorysoft.business.calc.service.*;
-import cn.com.victorysoft.business.indicator.dto.UnitMonthDto;
-import cn.com.victorysoft.business.indicator.entity.WellSectionMonth;
-import cn.com.victorysoft.business.indicator.param.SectionRateWellExportParam;
-import cn.com.victorysoft.business.indicator.param.WellSectionMonthParam;
-import cn.com.victorysoft.business.indicator.service.LessSummaryService;
-import cn.com.victorysoft.business.indicator.service.MoreSummaryService;
-import cn.com.victorysoft.business.indicator.service.SectionRateSummaryService;
-import cn.com.victorysoft.business.sys.entity.DateRange;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.sys.param.UnitDateParam;
-import cn.com.victorysoft.business.sys.param.UnitMonthParam;
-import cn.com.victorysoft.business.util.DateUtils;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-@Api(tags = "系统首页")
-@RestController
-@RequestMapping("index")
-public class IndexController {
-    @Resource
-    private IndexService indexService;
-
-    @GetMapping("/daily")
-    @ApiOperation("查询单位日度数据")
-    public UnitDaily selectUnitDaily(UnitDateParam param){
-        return indexService.selectUnitDaily(param);
-    }
-
-    @GetMapping("/month")
-    @ApiOperation("查询单位月度数据")
-    public IndexUnitMonthDto selectUnitDaily(UnitMonthParam param){
-        return indexService.selectUnitMonth(param);
-    }
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dao/AbnormalDataSyncDao.java

@@ -1,20 +0,0 @@
-package cn.com.victorysoft.business.calc.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-
-@Mapper
-public interface AbnormalDataSyncDao {
-    /**
-     * 同步异常井数据
-     */
-    void syncAbnormalWell(Date date);
-
-    /**
-     * 汇总异常井单位数据
-     */
-    void summaryAbnormalUnit(@Param("date") Date date, @Param("unitColumn") String unitColumn);
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dao/AdjustDataSyncDao.java

@@ -1,20 +0,0 @@
-package cn.com.victorysoft.business.calc.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-
-@Mapper
-public interface AdjustDataSyncDao {
-    /**
-     * 生成测调计划数据
-     */
-    void generateAdjustPlan(Date date);
-
-    /**
-     * 每天更新测调完成数据
-     */
-    void finishAdjustPlan();
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dao/ConditionDataSyncDao.java

@@ -1,16 +0,0 @@
-package cn.com.victorysoft.business.calc.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-
-@Mapper
-public interface ConditionDataSyncDao {
-
-    /**
-     * 汇总单位数据
-     */
-    void summary(@Param("date") Date date);
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dao/DataSyncDao.java

@@ -1,51 +0,0 @@
-package cn.com.victorysoft.business.calc.dao;
-
-import cn.com.victorysoft.business.calc.entity.SysInjectTechnology;
-import cn.com.victorysoft.business.indicator.entity.WellSectionMonth;
-import cn.com.victorysoft.business.sys.entity.DateRange;
-import cn.com.victorysoft.business.sys.entity.WellSectionDaily;
-import cn.com.victorysoft.business.sys.param.UnitDateParam;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-import java.util.List;
-
-@Mapper
-public interface DataSyncDao {
-    /**
-     * 同步水井基础数据
-     */
-    void syncWaterWell();
-    /**
-     * 同步单注井层段日数据
-     */
-    void syncSingleWellDaily(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("injectCodes") List<String> injectCodes);
-    /**
-     * 同步分注井层段日数据
-     */
-    void syncWellSectionDaily(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("injectCodes") List<String> injectCodes);
-
-    /**
-     * 水井层段月数据-基础数据
-     */
-    List<WellSectionMonth> selectWellSectionMonthBasic(String unitcode, DateRange dateRange);
-
-    /**
-     * 水井层段月数据-按照井统计
-     */
-    List<WellSectionMonth> summaryByWell(String unitcode, DateRange dateRange);
-
-    /**
-     * 水井层段月数据-按照注水工艺、配注变化统计
-     * 注水工艺有变化，按照变化后的数据统计
-     * 改配注井按照时长判断，不按照整月判断
-     */
-    List<WellSectionMonth> summaryWellSectionMonth(String unitcode, DateRange dateRange);
-
-    /**
-     * 查询注水工艺
-     */
-    List<SysInjectTechnology> selectInjectTechnology();
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dao/FlushDataSyncDao.java

@@ -1,23 +0,0 @@
-package cn.com.victorysoft.business.calc.dao;
-
-import cn.com.victorysoft.business.calc.entity.SysInjectTechnology;
-import cn.com.victorysoft.business.indicator.entity.WellSectionMonth;
-import cn.com.victorysoft.business.sys.entity.DateRange;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-import java.util.List;
-
-@Mapper
-public interface FlushDataSyncDao {
-    /**
-     * 同步洗井运行数据
-     */
-    void syncFlushRecord(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
-
-    void insertFlushDaily();
-
-    void updateFlushDaily();
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dao/IndexDao.java

@@ -1,11 +0,0 @@
-package cn.com.victorysoft.business.calc.dao;
-
-import cn.com.victorysoft.business.calc.entity.UnitDaily;
-import cn.com.victorysoft.business.sys.param.UnitDateParam;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface IndexDao {
-
-    UnitDaily selectUnitDaily(UnitDateParam param);
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dao/QualityDataSyncDao.java

@@ -1,21 +0,0 @@
-package cn.com.victorysoft.business.calc.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-
-@Mapper
-public interface QualityDataSyncDao {
-    /**
-     * 同步水质检测数据
-     */
-    void syncQualityData(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
-
-    /**
-     * 同步水质检测数据
-     */
-    void szjcsjQualityData(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
-    void xchyfxQualityData(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dao/WellToolDataSyncDao.java

@@ -1,17 +0,0 @@
-package cn.com.victorysoft.business.calc.dao;
-
-import cn.com.victorysoft.business.technology.entity.WellTool;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-import java.util.List;
-
-@Mapper
-public interface WellToolDataSyncDao {
-    /**
-     * 从源头查询数据
-     */
-    List<WellTool> selectList(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dao/WellTubeDataSyncDao.java

@@ -1,20 +0,0 @@
-package cn.com.victorysoft.business.calc.dao;
-
-import cn.com.victorysoft.business.calc.entity.Fla55;
-import cn.com.victorysoft.business.technology.entity.WellTool;
-import cn.com.victorysoft.business.technology.entity.WellTube;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Date;
-import java.util.List;
-
-@Mapper
-public interface WellTubeDataSyncDao {
-    /**
-     * 从源头查询数据
-     */
-    List<WellTube> selectList(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
-
-    List<Fla55> selectFla55();
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/dto/IndexUnitMonthDto.java

@@ -1,33 +0,0 @@
-package cn.com.victorysoft.business.calc.dto;
-
-import cn.com.victorysoft.business.indicator.entity.UnitMonth;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class IndexUnitMonthDto {
-
-    // 本单位本月
-    private UnitMonth current;
-    // 本单位上月
-    private UnitMonth prevMonth;
-    // 本单位上年同期
-    private UnitMonth prevYear;
-
-    // 本单位及子单位数据
-    private List<UnitMonth> list;
-
-    public void setCurrent(UnitMonth current) {
-        this.current = current != null ? current : new UnitMonth();
-    }
-
-    public void setPrevMonth(UnitMonth prevMonth) {
-        this.prevMonth = prevMonth != null ? prevMonth : new UnitMonth();
-    }
-
-    public void setPrevYear(UnitMonth prevYear) {
-        this.prevYear = prevYear != null ? prevYear : new UnitMonth();
-    }
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/entity/Fla55.java

@@ -1,10 +0,0 @@
-package cn.com.victorysoft.business.calc.entity;
-
-import lombok.Data;
-
-@Data
-public class Fla55 {
-    private String lb;
-    private String dmmc;
-    private String dm;
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/entity/SysInjectTechnology.java

@@ -1,43 +0,0 @@
-package cn.com.victorysoft.business.calc.entity;
-
-import java.io.Serializable;
-import lombok.Data;
-
-/**
- * @author 
- * 注水工艺
- */
-@Data
-public class SysInjectTechnology implements Serializable {
-    /**
-     * 代码
-     */
-    private String dm;
-
-    /**
-     * 类别
-     */
-    private String lb;
-
-    /**
-     * 代码名称
-     */
-    private String dmmc;
-
-    /**
-     * 注水工艺
-     */
-    private String zsgy;
-
-    /**
-     * 同心双管
-     */
-    private Boolean txsg;
-
-    /**
-     * 方停判断
-     */
-    private Boolean ftpd;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/entity/UnitDaily.java

@@ -1,41 +0,0 @@
-package cn.com.victorysoft.business.calc.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class UnitDaily {
-
-    @ApiModelProperty("总井数")
-    private Integer totalWell;
-
-    @ApiModelProperty("开井数")
-    private Integer openWell;
-
-    @ApiModelProperty("单注井数")
-    private Integer singleWell;
-
-    @ApiModelProperty("分注井数")
-    private Integer splitWell;
-
-    @ApiModelProperty("日注水量")
-    private BigDecimal dailyWater;
-
-    @ApiModelProperty("总井数比昨")
-    private Integer totalWellDiff;
-
-    @ApiModelProperty("开井数比昨")
-    private Integer openWellDiff;
-
-    @ApiModelProperty("单注井数比昨")
-    private Integer singleWellDiff;
-
-    @ApiModelProperty("分注井数比昨")
-    private Integer splitWellDiff;
-
-    @ApiModelProperty("日注水量比昨")
-    private BigDecimal dailyWaterDiff;
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/param/RealtimeRange.java

@@ -1,33 +0,0 @@
-package cn.com.victorysoft.business.calc.param;
-
-import cn.com.victorysoft.business.util.DateUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.SneakyThrows;
-
-import java.util.Calendar;
-import java.util.Date;
-
-@Data
-@ApiModel("实时数据班次")
-public class RealtimeRange {
-    @ApiModelProperty("日期")
-    private Date date;
-    @ApiModelProperty("班次时间，08:00")
-    private String time;
-
-    @SneakyThrows
-    public Date parseDate() {
-        return DateUtils.parseDate(DateUtils.formatDate(date) + " " + time, "yyyy-MM-dd HH:mm");
-    }
-
-    public static RealtimeRange getFromDate(Date dateTime) {
-        Date date = DateUtils.truncate(dateTime, Calendar.DATE);
-        String time = DateUtils.format(dateTime, "HH:mm");
-        RealtimeRange range = new RealtimeRange();
-        range.setDate(date);
-        range.setTime(time);
-        return range;
-    }
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/AbnormalDataSyncService.java

@@ -1,50 +0,0 @@
-package cn.com.victorysoft.business.calc.service;
-
-import cn.com.victorysoft.business.calc.dao.AbnormalDataSyncDao;
-import cn.com.victorysoft.business.calc.dao.FlushDataSyncDao;
-import cn.com.victorysoft.business.condition.service.AbnormalUnitService;
-import cn.com.victorysoft.business.condition.service.AbnormalWellService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.Date;
-
-/**
- * 异常井数据同步服务
- */
-@Slf4j
-@Service
-public class AbnormalDataSyncService {
-
-    @Resource
-    private AbnormalDataSyncDao abnormalDataSyncDao;
-    @Resource
-    private AbnormalWellService abnormalWellService;
-    @Resource
-    private AbnormalUnitService abnormalUnitService;
-
-    /**
-     * 同步异常井日度数据
-     */
-    @Transactional
-    public void syncAbnormalWell(Date date) {
-        // 先删除
-        abnormalWellService.deleteByDate(date);
-        abnormalDataSyncDao.syncAbnormalWell(date);
-    }
-
-    /**
-     * 汇总单位异常井日度数据
-     */
-    @Transactional
-    public void summaryAbnormalUnit(Date date) {
-        // 先删除
-        abnormalUnitService.deleteByDate(date);
-        abnormalDataSyncDao.summaryAbnormalUnit(date, "unitcode");
-        abnormalDataSyncDao.summaryAbnormalUnit(date, "unitcode_area");
-        abnormalDataSyncDao.summaryAbnormalUnit(date, "unitcode_company");
-        abnormalDataSyncDao.summaryAbnormalUnit(date, "unitcode_group");
-    }
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/AdjustDataSyncService.java

@@ -1,42 +0,0 @@
-package cn.com.victorysoft.business.calc.service;
-
-import cn.com.victorysoft.business.calc.dao.AdjustDataSyncDao;
-import cn.com.victorysoft.business.calc.dao.FlushDataSyncDao;
-import cn.com.victorysoft.business.condition.service.AdjustPlanService;
-import cn.com.victorysoft.business.util.DateUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.Date;
-
-/**
- * 测调数据同步服务
- */
-@Slf4j
-@Service
-public class AdjustDataSyncService {
-
-    @Resource
-    private AdjustDataSyncDao adjustDataSyncDao;
-    @Resource
-    private AdjustPlanService adjustPlanService;
-
-    /**
-     * 生成测调计划数据
-     */
-    @Transactional
-    public void generateAdjustPlan(Date date) {
-        String month = DateUtils.format(DateUtils.addMonths(date, 1), "yyyyMM");
-        adjustPlanService.deleteByMonth(month);
-        adjustDataSyncDao.generateAdjustPlan(date);
-    }
-
-    /**
-     * 每天更新测调完成数据
-     */
-    public void finishAdjustPlan() {
-        adjustDataSyncDao.finishAdjustPlan();
-    }
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/ConditionDataSyncService.java

@@ -1,36 +0,0 @@
-package cn.com.victorysoft.business.calc.service;
-
-import cn.com.victorysoft.business.calc.dao.AbnormalDataSyncDao;
-import cn.com.victorysoft.business.calc.dao.ConditionDataSyncDao;
-import cn.com.victorysoft.business.condition.service.AbnormalUnitService;
-import cn.com.victorysoft.business.condition.service.AbnormalWellService;
-import cn.com.victorysoft.business.condition.service.ConditionUnitService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.Date;
-
-/**
- * 工况数据同步服务
- */
-@Slf4j
-@Service
-public class ConditionDataSyncService {
-
-    @Resource
-    private ConditionUnitService conditionUnitService;
-    @Resource
-    private ConditionDataSyncDao conditionDataSyncDao;
-
-    /**
-     * 汇总
-     */
-    @Transactional
-    public void summary(Date date) {
-        // 先删除
-        conditionUnitService.deleteByDate(date);
-        conditionDataSyncDao.summary(date);
-    }
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/DataSyncService.java

@@ -1,381 +0,0 @@
-package cn.com.victorysoft.business.calc.service;
-
-import cn.com.victorysoft.business.calc.dao.DataSyncDao;
-import cn.com.victorysoft.business.calc.entity.SysInjectTechnology;
-import cn.com.victorysoft.business.constant.DataType;
-import cn.com.victorysoft.business.indicator.dao.WellSectionMonthDao;
-import cn.com.victorysoft.business.indicator.entity.WellSectionMonth;
-import cn.com.victorysoft.business.indicator.param.WellSectionMonthParam;
-import cn.com.victorysoft.business.indicator.service.SectionRateSummaryService;
-import cn.com.victorysoft.business.indicator.service.UnitMonthService;
-import cn.com.victorysoft.business.indicator.service.WellSectionMonthService;
-import cn.com.victorysoft.business.sys.dao.WellSectionDailyDao;
-import cn.com.victorysoft.business.sys.entity.DateRange;
-import cn.com.victorysoft.business.sys.entity.WellSectionDaily;
-import cn.com.victorysoft.business.sys.param.UnitDateRangeParam;
-import cn.com.victorysoft.business.util.BeanUtils;
-import cn.com.victorysoft.business.util.DateUtils;
-import cn.com.victorysoft.business.util.StringUtils;
-import cn.com.victorysoft.business.util.UuidUtils;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static cn.com.victorysoft.business.indicator.constant.Constants.*;
-
-/**
- * 数据同步服务
- */
-@Slf4j
-@Service
-public class DataSyncService {
-
-    @Resource
-    private WellSectionDailyDao wellSectionDailyDao;
-    @Resource
-    private WellSectionMonthDao wellSectionMonthDao;
-    @Resource
-    private DataSyncDao dataSyncDao;
-    @Resource
-    private UnitMonthService unitMonthService;
-    @Resource
-    private WellSectionMonthService wellSectionMonthService;
-    @Resource
-    private SectionRateSummaryService sectionRateSummaryService;
-
-    /**
-     * 静态数据
-     */
-    @Transactional
-    public void syncStaticData() {
-        dataSyncDao.syncWaterWell();
-    }
-
-    /**
-     * 同步注水层段日度数据
-     */
-    @Transactional
-    public void syncWellSectionDaily(Date startDate, Date endDate) {
-        // 先删除
-        wellSectionDailyDao.deleteByDate(startDate, endDate);
-        // 查询注水工艺
-        List<SysInjectTechnology> technologyList = dataSyncDao.selectInjectTechnology();
-        // 单注工艺代码
-        List<String> singleCodes = technologyList.stream()
-                .filter(item -> "单注".equals(item.getZsgy()))
-                .map(SysInjectTechnology::getDm)
-                .collect(Collectors.toList());
-        // 分注工艺代码
-        List<String> splitCodes = technologyList.stream()
-                .filter(item -> "分注".equals(item.getZsgy()))
-                .map(SysInjectTechnology::getDm)
-                .collect(Collectors.toList());
-        // 同步单注井数据
-        dataSyncDao.syncSingleWellDaily(startDate, endDate, singleCodes);
-        // 同步分注井数据
-        dataSyncDao.syncWellSectionDaily(startDate, endDate, splitCodes);
-        // 计算注水类型
-        this.updateInjectType(startDate, endDate);
-    }
-
-    /**
-     * 计算注水类型
-     */
-    public void updateInjectType(Date startDate, Date endDate) {
-        // 查询注水工艺
-        Map<String, SysInjectTechnology> technologyMap = dataSyncDao.selectInjectTechnology()
-                .stream().collect(Collectors.toMap(SysInjectTechnology::getDm, v -> v));
-        // 查询注水数据
-        List<WellSectionDaily> list = wellSectionDailyDao.selectByDate(startDate, endDate);
-        // 查找方停的井
-        Map<String, Set<Integer>> stopWellNames = new HashMap<>();
-        for (WellSectionDaily record : list) {
-            String wellname = record.getWellname();
-            Integer section = record.getSection();
-            if (!stopWellNames.containsKey(wellname)) {
-                stopWellNames.put(wellname, new HashSet<>());
-            }
-            if (record.getNozzle() != null && record.getNozzle().contains("方停")) {
-                stopWellNames.get(wellname).add(section);
-            }else {
-                stopWellNames.get(wellname).remove(section);
-            }
-        }
-        for (WellSectionDaily record : list) {
-            String injectTypeYs = record.getInjectTypeYs();
-            SysInjectTechnology technology = technologyMap.get(injectTypeYs);
-            // 如果注水工艺不存在，不判断
-            if (technology == null) continue;
-            if ("单注".equals(technology.getZsgy())) {
-                record.setInjectType(DAN_ZHU);
-            }else if ("分注".equals(technology.getZsgy())) {
-                Integer planSection = record.getPlanSection();
-                // 如果水嘴包含方停，则需要减去
-                planSection = planSection - stopWellNames.get(record.getWellname()).size();
-                if (planSection == 1) {
-                    record.setInjectType(FEN_ZHU1);
-                }else if (planSection == 2) {
-                    // 判断同心双管
-                    if (technology.getTxsg()) {
-                        record.setInjectType(FEN_ZHU2_TONG_XIN);
-                    }else {
-                        record.setInjectType(FEN_ZHU2);
-                    }
-                }else if (planSection == 3) {
-                    record.setInjectType(FEN_ZHU3);
-                }else if (planSection == 4) {
-                    record.setInjectType(FEN_ZHU4);
-                }else if (planSection == 5) {
-                    record.setInjectType(FEN_ZHU5);
-                }else if (planSection == 6) {
-                    record.setInjectType(FEN_ZHU6);
-                }else if (planSection == 7) {
-                    record.setInjectType(FEN_ZHU7);
-                }
-            }
-        }
-        list = list.stream().filter(item -> StringUtils.isNotEmpty(item.getInjectType())).collect(Collectors.toList());
-        if (list.size() > 0) {
-            // 每批commit的个数
-            int batchCount = 500;
-            int index = 0;
-            do {
-                int batchLastIndex = Math.min(index + batchCount, list.size());
-                List<WellSectionDaily> tmp = list.subList(index, batchLastIndex);
-                wellSectionDailyDao.updateInjectType(tmp);
-                index = index + batchCount;
-            } while (index < list.size());
-        }
-    }
-
-    /**
-     * 注水层段日度数据汇总到月数据
-     */
-    @SneakyThrows
-    @Transactional
-    public void summaryWellSectionMonth(String month) {
-        DateRange dateRange;
-        if (month == null || "".equals(month)) {
-            dateRange = DateUtils.getLastMonth(new Date());
-            month = dateRange.getName();
-        }else {
-            dateRange = DateUtils.getMonthRange(DateUtils.parseDate(month, "yyyyMM"));
-        }
-        // 先删除
-        wellSectionMonthDao.deleteByMonth(month);
-        List<WellSectionMonth> list = calcWellSection(null, dateRange);
-        // 入库
-        if (list.size() > 0) {
-            // 每批commit的个数
-            int batchCount = 1;
-            int index = 0;
-            do {
-                int batchLastIndex = Math.min(index + batchCount, list.size());
-                List<WellSectionMonth> tmp = list.subList(index, batchLastIndex);
-                wellSectionMonthDao.insertBatch(tmp);
-                index = index + batchCount;
-            } while (index < list.size());
-        }
-    }
-
-    /**
-     * 计算日度时间段的层段数据
-     */
-    public List<WellSectionMonth> calcWellSectionDaily(WellSectionMonthParam param) {
-        if ("30200000".equals(param.getUnitcode())) {
-            param.setUnitcode(null);
-        }
-        List<WellSectionMonth> result = new ArrayList<>();
-        DateRange dateRange = new DateRange(param.getStartDate(), param.getEndDate(), "", DataType.daily);
-        List<WellSectionMonth> list = calcWellSection(param.getUnitcode(), dateRange);
-        // 入库
-        if (list.size() > 0) {
-            String tmpId = UuidUtils.generate();
-            list.forEach(item -> item.setTmpId(tmpId));
-            // 每批commit的个数
-            int batchCount = 100;
-            int index = 0;
-            do {
-                int batchLastIndex = Math.min(index + batchCount, list.size());
-                List<WellSectionMonth> tmp = list.subList(index, batchLastIndex);
-                wellSectionMonthDao.insertBatchTmp(tmp);
-                index = index + batchCount;
-            } while (index < list.size());
-            param.setTmpId(tmpId);
-            result = wellSectionMonthDao.selectListTmp(param);
-            result.forEach(item -> {
-                item.setStartDate(param.getStartDate());
-                item.setEndDate(param.getEndDate());
-            });
-            // 删除临时表的数据
-//            wellSectionMonthDao.deleteTmp(tmpId);
-        }
-        return result;
-    }
-
-    public List<WellSectionMonth> calcWellSection(String unitcode, DateRange dateRange) {
-        // 先查询层段的最后一条数据，作为基础数据
-        List<WellSectionMonth> list = dataSyncDao.selectWellSectionMonthBasic(unitcode, dateRange);
-
-        // 查询单井数据
-        List<WellSectionMonth> wellList = dataSyncDao.summaryByWell(unitcode, dateRange);
-        Map<String, WellSectionMonth> wellMap = wellList.stream().collect(Collectors.toMap(WellSectionMonth::getWellname, v -> v));
-
-        // 查询层段数据
-        List<WellSectionMonth> sectionList = dataSyncDao.summaryWellSectionMonth(unitcode, dateRange);
-        Map<String, WellSectionMonth> sectionMap = sectionList.stream().collect(Collectors.toMap(this::getKey, v -> v));
-
-        // 分析评价 开始
-        for (WellSectionMonth record : list) {
-            // 是否判断出结果
-            boolean hasResult = false;
-            // 首先判断单井信息
-            WellSectionMonth wellInfo = wellMap.get(record.getWellname());
-            record.setSectionOpen(wellInfo.getSectionOpen());
-            record.setWaterWellClassify(wellInfo.getWaterWellClassify());
-            record.setRemarkNoCheck(wellInfo.getRemarkNoCheck());
-            // 判断开井，逻辑见sql(生产时间大于等于24h且月累计注水量大于0.5为开井)
-            if (!wellInfo.getSectionOpen()) {
-                // 如果是关井，分析评价为空
-                record.setEvaluate(null);
-                record.setEvaluateBasis("不检查井：关井，生产时间大于等于24h且月累计注水量大于0为开井");
-                hasResult = true;
-            }
-
-            // 判断是否为不检查井，不检查井的所有层都是不检查层
-            // 不检查井：注水时间（月度累计值）：＜7*24h
-            if (!hasResult && wellInfo.getDayNum() != null && wellInfo.getDayNum() < 7) {
-                record.setEvaluate(NO_CHECK);
-                record.setEvaluateBasis("不检查井：注水时间（月度累计值）：＜7*24h");
-                hasResult = true;
-            }
-            // 不检查井：判断备注
-            if (!hasResult && wellInfo.getRemarkNoCheck() != null && wellInfo.getRemarkNoCheck()) {
-                record.setEvaluate(NO_CHECK);
-                record.setEvaluateBasis("不检查井：备注原因");
-                hasResult = true;
-            }
-            // 不检查层：方停且日注水量=0或者空
-            if (!hasResult && record.getNozzle() != null && record.getNozzle().contains("方停")
-                    && (record.getDailyWater() == null || record.getDailyWater().compareTo(BigDecimal.ZERO) == 0)) {
-                record.setEvaluate(NO_CHECK);
-                record.setEvaluateBasis("不检查层：方停且日注水量=0或者空");
-                hasResult = true;
-            }
-
-            // 注水工艺和配注变化统计
-            WellSectionMonth sectionInfo = sectionMap.get(this.getKey(record));
-            if (sectionInfo != null) {
-                record.setPp(sectionInfo.getPp());
-                record.setPc(sectionInfo.getPc());
-                record.setPt(sectionInfo.getPt());
-                record.setPlanDailyWater(sectionInfo.getPlanDailyWater());
-                record.setMonthWater(sectionInfo.getMonthWater());
-                record.setDayNum(sectionInfo.getDayNum());
-                record.setDailyWater(sectionInfo.getDailyWater());
-                record.setDailyAbility(sectionInfo.getDailyAbility());
-                if (!hasResult && sectionInfo.getDayNum() != null && sectionInfo.getDayNum() < 7) {
-                    record.setEvaluate(NO_CHECK);
-                    record.setEvaluateBasis("不检查层：注水时间：＜7*24h");
-                    hasResult = true;
-                }
-            }
-
-            // 计算（月注水量/注水时间）/日配注量
-            Double rate = null;
-            if (record.getDailyAbility() != null
-                    && record.getPlanDailyWater() != null
-                    && record.getPlanDailyWater().compareTo(BigDecimal.ZERO) > 0) {
-                rate = record.getDailyAbility().divide(record.getPlanDailyWater(), 2, RoundingMode.HALF_UP).doubleValue();
-            }
-            // 计算差值
-            if (record.getDailyAbility() != null && record.getPlanDailyWater() != null) {
-                record.setDiffWater(record.getDailyAbility().subtract(record.getPlanDailyWater()));
-            }
-
-            // 如果有计算结果，则不继续计算
-            if (hasResult) continue;
-
-            /*  合格层
-             * (1) 80%≤（月注水量/注水时间）/日配注量≤120%
-             * (2) 月注水量为0且（配注为0或动停）
-             */
-            if ((rate != null && rate >= 0.8 && rate <= 1.2)) {
-                record.setEvaluate(NORMAL);
-                record.setEvaluateBasis("80%≤（月注水量/注水时间）/日配注量≤120%");
-                continue;
-            }
-            if (record.getMonthWater() != null && record.getMonthWater().compareTo(BigDecimal.ZERO) == 0
-                    && ((record.getPlanDailyWater() != null && record.getPlanDailyWater().compareTo(BigDecimal.ZERO) == 0)
-                    || (record.getNozzle() != null && record.getNozzle().contains("动停")))) {
-                record.setEvaluate(NORMAL);
-                record.setEvaluateBasis("月注水量为0且（配注为0或动停）");
-                continue;
-            }
-
-            /*  欠注层
-             * （月注水量/注水时间）/日配注量＜80%
-             */
-            if (rate != null && rate < 0.8) {
-                record.setEvaluate(LESS);
-                record.setEvaluateBasis("（月注水量/注水时间）/日配注量＜80%");
-                // 欠注类型
-                if (record.getNozzle() != null && record.getNozzle().contains("控制")) {
-                    record.setLessType(LESS_TYPE_NOZZLE);
-                }
-                // 除了带嘴欠注，都是放大
-                else {
-                    record.setLessType(LESS_TYPE_BIG);
-                }
-                continue;
-            }
-
-            /*  超注层
-             * （1）分注井且配注：动停、月注水量：＞0
-             * （2）（月注水量/注水时间）/日配注量＞120%
-             */
-            if (!"DAN_ZHU".equals(record.getInjectType()) // DAN_ZHU为单注
-                    && record.getNozzle() != null && record.getNozzle().contains("动停")
-                    && record.getMonthWater() != null
-                    && record.getMonthWater().compareTo(BigDecimal.ZERO) > 0) {
-                record.setEvaluate(MORE);
-                record.setEvaluateBasis("分注井且配注：动停、月注水量：＞0");
-                continue;
-            }
-            if (rate != null && rate > 1.2) {
-                record.setEvaluate(MORE);
-                record.setEvaluateBasis("（月注水量/注水时间）/日配注量＞120%");
-                continue;
-            }
-            // 不清井
-            // 分注井，有分层，无分层数据（注水层位）且日注水量为空
-//            if (!"DAN_ZHU".equals(record.getInjectType())
-//                    && StringUtils.isEmpty(record.getLayer())
-//                    && record.getDailyWater() == null) {
-//                record.setEvaluate(UNCLEAR);
-//            }
-            record.setEvaluate(UNCLEAR);
-        }
-        // 分析评价 结束
-        return list;
-    }
-
-    private String getKey(WellSectionMonth item) {
-        return item.getWellname() + "_" + item.getMonth() + "_" + item.getSection();
-    }
-
-    public void summaryMonth(String month) {
-        log.info("月度数据汇总任务开始");
-        this.summaryWellSectionMonth(month);
-        sectionRateSummaryService.summary(month);
-        unitMonthService.syncUnitMonth(month);
-        log.info("月度数据汇总任务结束");
-    }
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/FlushDataSyncService.java

@@ -1,46 +0,0 @@
-package cn.com.victorysoft.business.calc.service;
-
-import cn.com.victorysoft.business.calc.dao.DataSyncDao;
-import cn.com.victorysoft.business.calc.dao.FlushDataSyncDao;
-import cn.com.victorysoft.business.calc.entity.SysInjectTechnology;
-import cn.com.victorysoft.business.indicator.dao.WellSectionMonthDao;
-import cn.com.victorysoft.business.indicator.entity.WellSectionMonth;
-import cn.com.victorysoft.business.sys.dao.WellSectionDailyDao;
-import cn.com.victorysoft.business.sys.entity.DateRange;
-import cn.com.victorysoft.business.sys.entity.WellSectionDaily;
-import cn.com.victorysoft.business.util.DateUtils;
-import cn.com.victorysoft.business.util.StringUtils;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static cn.com.victorysoft.business.indicator.constant.Constants.*;
-
-/**
- * 洗井数据同步服务
- */
-@Slf4j
-@Service
-public class FlushDataSyncService {
-
-    @Resource
-    private FlushDataSyncDao flushDataSyncDao;
-
-    /**
-     * 同步洗井运行情况
-     */
-    @Transactional
-    public void syncFlushRecord(Date startDate, Date endDate) {
-        flushDataSyncDao.syncFlushRecord(startDate, endDate);
-        flushDataSyncDao.insertFlushDaily();
-        flushDataSyncDao.updateFlushDaily();
-    }
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/IndexService.java

@@ -1,85 +0,0 @@
-package cn.com.victorysoft.business.calc.service;
-
-import cn.com.victorysoft.business.calc.dao.IndexDao;
-import cn.com.victorysoft.business.calc.dto.IndexUnitMonthDto;
-import cn.com.victorysoft.business.calc.entity.UnitDaily;
-import cn.com.victorysoft.business.indicator.dao.UnitMonthDao;
-import cn.com.victorysoft.business.indicator.entity.UnitMonth;
-import cn.com.victorysoft.business.indicator.service.UnitMonthService;
-import cn.com.victorysoft.business.sys.param.UnitDateParam;
-import cn.com.victorysoft.business.sys.param.UnitMonthParam;
-import cn.com.victorysoft.business.util.DateUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.Index;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 水质检测数据同步服务
- */
-@Slf4j
-@Service
-public class IndexService {
-
-    @Resource
-    private IndexDao indexDao;
-    @Resource
-    private UnitMonthDao unitMonthDao;
-
-    /**
-     * 查询单位日度数据
-     */
-    public UnitDaily selectUnitDaily(UnitDateParam param) {
-        UnitDaily today = indexDao.selectUnitDaily(param);
-        UnitDateParam paramYesterday = new UnitDateParam();
-        paramYesterday.setUnitcode(param.getUnitcode());
-        paramYesterday.setTestdate(DateUtils.addDays(param.getTestdate(), - 1));
-        UnitDaily yesterday = indexDao.selectUnitDaily(paramYesterday);
-        if (today == null) {
-            today = new UnitDaily();
-        }
-        if (yesterday != null) {
-            today.setTotalWellDiff(sub(today.getTotalWell(), yesterday.getTotalWell()));
-            today.setOpenWellDiff(sub(today.getOpenWell(), yesterday.getOpenWell()));
-            today.setSingleWellDiff(sub(today.getSingleWell(), yesterday.getSingleWell()));
-            today.setSplitWellDiff(sub(today.getSplitWell(), yesterday.getSplitWell()));
-            today.setDailyWaterDiff(sub(today.getDailyWater(), yesterday.getDailyWater()));
-        }
-        return today;
-    }
-
-    public IndexUnitMonthDto selectUnitMonth(UnitMonthParam param) {
-        IndexUnitMonthDto dto = new IndexUnitMonthDto();
-        // 查询单位本月
-        UnitMonth current = unitMonthDao.selectUnitMonth(param);
-        dto.setCurrent(current);
-        // 查询上月
-        UnitMonthParam paramPrev = new UnitMonthParam();
-        paramPrev.setUnitcode(param.getUnitcode());
-        paramPrev.setMonth(DateUtils.getPreviousMonth(param.getMonth(), 1));
-        UnitMonth prevMonth = unitMonthDao.selectUnitMonth(paramPrev);
-        dto.setPrevMonth(prevMonth);
-        // 查询去年同期
-        paramPrev.setMonth(DateUtils.getPreviousMonth(param.getMonth(), 12));
-        UnitMonth prevYear = unitMonthDao.selectUnitMonth(paramPrev);
-        dto.setPrevYear(prevYear);
-
-        // 查询本单位和子单位数据
-        List<UnitMonth> list = unitMonthDao.selectListMonth(param);
-        dto.setList(list);
-
-        return dto;
-    }
-
-    private Integer sub(Integer today, Integer yesterday) {
-        return today != null && yesterday != null ? today - yesterday : null;
-    }
-
-    private BigDecimal sub(BigDecimal today, BigDecimal yesterday) {
-        return today != null && yesterday != null ? today.subtract(yesterday) : null;
-    }
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/QualityDataSyncService.java

@@ -1,33 +0,0 @@
-package cn.com.victorysoft.business.calc.service;
-
-import cn.com.victorysoft.business.calc.dao.FlushDataSyncDao;
-import cn.com.victorysoft.business.calc.dao.QualityDataSyncDao;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.Date;
-
-/**
- * 水质检测数据同步服务
- */
-@Slf4j
-@Service
-public class QualityDataSyncService {
-
-    @Resource
-    private QualityDataSyncDao qualityDataSyncDao;
-
-    @Transactional
-    public void syncQualityData(Date startDate, Date endDate) {
-        qualityDataSyncDao.syncQualityData(startDate, endDate);
-    }
-
-    @Transactional
-    public void xchyfxSzjcsj(Date startDate, Date endDate) {
-        qualityDataSyncDao.szjcsjQualityData(startDate, endDate);
-        qualityDataSyncDao.xchyfxQualityData(startDate, endDate);
-    }
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/RealtimeService.java

@@ -1,221 +0,0 @@
-package cn.com.victorysoft.business.calc.service;
-
-import cn.com.victorysoft.business.calc.param.RealtimeRange;
-import cn.com.victorysoft.business.indicator.entity.Pump;
-import cn.com.victorysoft.business.indicator.entity.PumpDevice;
-import cn.com.victorysoft.business.indicator.service.PumpDeviceService;
-import cn.com.victorysoft.business.util.DateUtils;
-import cn.com.victorysoft.business.util.StringUtils;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 实时数据服务
- */
-@Slf4j
-@Service
-public class RealtimeService {
-
-    @Value("${realtime.remote.url}")
-    private String realtimeRemoteUrl;
-    @Value("${realtime.remote.username}")
-    private String realtimeRemoteUsername;
-    @Value("${realtime.remote.password}")
-    private String realtimeRemotePassword;
-
-    @Resource
-    private PumpDeviceService pumpDeviceService;
-
-    @Resource
-    private RestTemplate restTemplate;
-
-    /**
-     * 全部注水泵数据
-     */
-    public void syncPumpDeviceList() {
-        List<Pump> pumps = pumpDeviceService.selectPump(null);
-        for (Pump pump : pumps) {
-            this.syncPumpDevice(pump);
-        }
-    }
-
-    /**
-     * 注水泵数据
-     */
-    @Transactional
-    public void syncPumpDevice(Pump pump) {
-        // 检查是否存在
-        Date recordDate = DateUtils.truncate(new Date(), Calendar.DATE);
-        PumpDevice device = new PumpDevice();
-        device.setStationName(pump.getStationName());
-        device.setPumpId(pump.getId());
-        device.setRecordDate(recordDate);
-        device.setUnitcode(pump.getAreaCode());
-        device.setPumpType(pump.getPumpType());
-        PumpDevice pumpDevice = pumpDeviceService.selectPumpDevice(device);
-        if (pumpDevice != null) return;
-
-        String url = realtimeRemoteUrl + "getDqBeng.json";
-        ResponseEntity<String> result = null;
-        boolean success = false;
-        try{
-            result = restTemplate.postForEntity(url, buildDevicePostBody(pump.getId()), String.class);
-            success = result.getStatusCodeValue() == 200;
-        }catch (Exception e) {
-            log.error("注水泵实时数据获取异常", e);
-        }
-        if (result == null || !success) return;
-        log.info("注水泵实时数据接口返回结果：{}", result);
-        JSONArray data = JSONArray.fromObject(result.getBody());
-        if (data == null || data.size() == 0) return;
-
-        JSONObject jsonObject = data.getJSONObject(0);
-        if (StringUtils.isEmpty(device.getPumpType())) {
-            device.setPumpType(getString(jsonObject, "SBBM"));
-        }
-        // 运行时间
-        device.setRunTime(null);
-        // 运行状态
-        device.setRunStatus(getInteger(jsonObject, "YXZT"));
-        // 进口压力
-        device.setPressureIn(getDouble(jsonObject, "JKYL"));
-        // 出口压力
-        device.setPressureOut(getDouble(jsonObject, "CKYL"));
-        // 平衡压力
-        device.setPressureBalance(getDouble(jsonObject, "LLJ_YL"));
-        // 排量h
-        device.setVolumeHour(getDouble(jsonObject, "LLJ_SSLL"));
-        // 排量D
-        if (device.getVolumeHour() != null) {
-            device.setVolumeDay(device.getVolumeHour() * 24);
-        }
-        // 计算有效功率 = 【1000*排量（m³/h）*（出口压力-进口压力）Mpa*100】/3600*102
-        if (device.getVolumeHour() != null && device.getPressureOut() != null && device.getPressureIn() != null) {
-            device.setEffectivePower((1000 * device.getVolumeHour() * (device.getPressureOut() - device.getPressureIn()) * 100) / 3600 * 102);
-        }
-        // 电压
-        device.setVoltage(getDouble(jsonObject, "DC_UA"));
-        // 电流
-        device.setElectricCurrent(getDouble(jsonObject, "DC_IA"));
-        // 功率因数
-        device.setPowerFactor(getDouble(jsonObject, "DC_GLYS"));
-        // 效率
-        if (pump.getEfficiency() != null) {
-            device.setEfficiency(pump.getEfficiency().doubleValue());
-        }
-        // 输入功率 = 1.732*电流*电压*功率因数
-        if (device.getVoltage() != null && device.getElectricCurrent() != null && device.getPowerFactor() != null) {
-            device.setPowerIn(1.732 * device.getElectricCurrent() * device.getVoltage() * device.getPowerFactor());
-        }
-        // 输出功率 = 输入功率*效率
-        if (device.getPowerIn() != null && device.getEfficiency() != null) {
-            device.setPowerOut(device.getPowerIn() * device.getEfficiency());
-        }
-        // TODO 分水器压力，从PCS表SSC_FZ_SS获取，但是没有输出接口，先使用出口压力-0.3
-        if (device.getPressureOut() != null) {
-            device.setPressureSplit(device.getPressureOut() - 0.3);
-        }
-        pumpDeviceService.insert(device);
-    }
-
-    private BigDecimal subtract(BigDecimal d1, BigDecimal d0, double max, BigDecimal defaultValue) {
-        if (d1 != null && d0 != null) {
-            BigDecimal d = d1.subtract(d0);
-            if (d.doubleValue() >= 0 && d.doubleValue() < max) {
-                return d;
-            }
-        }
-        return defaultValue;
-    }
-
-    private JSONObject buildDevicePostBody(String deviceCode) {
-        JSONObject jsonParam = new JSONObject();
-        JSONObject head = new JSONObject();
-        head.put("username", realtimeRemoteUsername);
-        head.put("password", realtimeRemotePassword);
-        head.put("sbbm.s", deviceCode);
-        jsonParam.put("head", head);
-        jsonParam.put("body", new ArrayList<>(0));
-        return jsonParam;
-    }
-
-    private JSONObject buildPostBody(RealtimeRange param) {
-        JSONObject jsonParam = new JSONObject();
-        JSONObject head = new JSONObject();
-        head.put("username", realtimeRemoteUsername);
-        head.put("password", realtimeRemotePassword);
-        String dateStr = DateUtils.formatDate(param.getDate());
-        head.put("startDate.t",  dateStr+ " " + param.getTime() + ":00");
-        head.put("endDate.t", dateStr + " " + param.getTime() + ":00");
-        jsonParam.put("head", head);
-        jsonParam.put("body", new ArrayList<>(0));
-        return jsonParam;
-    }
-
-    @SneakyThrows
-    private JSONObject buildPostWellBody(String wellname, RealtimeRange param) {
-        JSONObject jsonParam = new JSONObject();
-        JSONObject head = new JSONObject();
-        head.put("username", realtimeRemoteUsername);
-        head.put("password", realtimeRemotePassword);
-        String dateStr = DateUtils.formatDate(param.getDate());
-        String startDateStr = dateStr+ " " + param.getTime() + ":00";
-        head.put("startDate.t", startDateStr);
-        Date startDate = DateUtils.parseDate(startDateStr, "yyyy-MM-dd HH:mm:ss");
-        // 取10分钟的数据，防止丢点
-        Date endDate = DateUtils.addMinutes(startDate, 10);
-        head.put("endDate.t", DateUtils.format(endDate, "yyyy-MM-dd HH:mm:ss"));
-        head.put("jh.s", wellname);
-        jsonParam.put("head", head);
-        jsonParam.put("body", new ArrayList<>(0));
-        return jsonParam;
-    }
-    
-    private String getString(JSONObject jsonObject, String key) {
-        if (jsonObject.containsKey(key)) {
-            return jsonObject.getString( key);
-        }
-        return null;
-    }
-    private Double getDouble(JSONObject jsonObject, String key) {
-        if (jsonObject.containsKey(key)) {
-            return jsonObject.getDouble(key);
-        }
-        return null;
-    }
-    private Integer getInteger(JSONObject jsonObject, String key) {
-        if (jsonObject.containsKey(key)) {
-            return jsonObject.getInt(key);
-        }
-        return null;
-    }
-    private Date getDate(JSONObject jsonObject, String key) {
-        if (jsonObject.containsKey(key)) {
-            try {
-                String dateStr = getString(jsonObject, key);
-                if (dateStr != null) {
-                    return DateUtils.parseDate(dateStr, "yyyy-MM-dd HH:mm:ss");
-                }
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/WellToolDataSyncService.java

@@ -1,71 +0,0 @@
-package cn.com.victorysoft.business.calc.service;
-
-import cn.com.victorysoft.business.calc.dao.FlushDataSyncDao;
-import cn.com.victorysoft.business.calc.dao.WellToolDataSyncDao;
-import cn.com.victorysoft.business.sys.entity.WellSectionDaily;
-import cn.com.victorysoft.business.sys.param.UnitWellMonthPageParam;
-import cn.com.victorysoft.business.technology.dao.WellToolDao;
-import cn.com.victorysoft.business.technology.entity.WellTool;
-import cn.com.victorysoft.business.util.BeanUtils;
-import cn.com.victorysoft.business.util.DateUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 井下工具数据同步服务
- */
-@Slf4j
-@Service
-public class WellToolDataSyncService {
-
-    @Resource
-    private WellToolDataSyncDao wellToolDataSyncDao;
-    @Resource
-    private WellToolDao wellToolDao;
-
-    /**
-     * 同步数据
-     */
-    @Transactional
-    public void sync(Date startDate, Date endDate) {
-        String month = DateUtils.format(endDate, "yyyyMM");
-        String prevMonth = DateUtils.format(DateUtils.addMonths(endDate, -1), "yyyyMM");
-        // 查询源头
-        List<WellTool> list = wellToolDataSyncDao.selectList(startDate, endDate);
-        Map<String, WellTool> wellToolMap = list.stream().collect(Collectors.toMap(WellTool::getJh, v -> v));
-        // 查询上月
-        UnitWellMonthPageParam param = new UnitWellMonthPageParam();
-        param.setMonth(prevMonth);
-        List<WellTool> prevMonthList = wellToolDao.selectList(param);
-        Map<String, WellTool> prevMonthMap = prevMonthList.stream().collect(Collectors.toMap(WellTool::getJh, v -> v));
-        // 合并源头数据和上月数据
-        for (WellTool wellTool : list) {
-            WellTool prevWellTool = prevMonthMap.get(wellTool.getJh());
-            if (prevWellTool != null) {
-                BeanUtils.mergeBean(wellTool, prevWellTool);
-            }
-        }
-        if (list.size() > 0) {
-            // 先删除，后插入
-            wellToolDao.deleteByMonth(month);
-            // 每批commit的个数
-            int batchCount = 500;
-            int index = 0;
-            do {
-                int batchLastIndex = Math.min(index + batchCount, list.size());
-                List<WellTool> tmp = list.subList(index, batchLastIndex);
-                wellToolDao.insertBatch(tmp);
-                index = index + batchCount;
-            } while (index < list.size());
-        }
-    }
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/service/WellTubeDataSyncService.java

@@ -1,90 +0,0 @@
-package cn.com.victorysoft.business.calc.service;
-
-import cn.com.victorysoft.business.calc.dao.WellTubeDataSyncDao;
-import cn.com.victorysoft.business.calc.dao.WellTubeDataSyncDao;
-import cn.com.victorysoft.business.calc.entity.Fla55;
-import cn.com.victorysoft.business.sys.param.UnitWellMonthPageParam;
-import cn.com.victorysoft.business.technology.dao.WellTubeDao;
-import cn.com.victorysoft.business.technology.dao.WellTubeDao;
-import cn.com.victorysoft.business.technology.entity.WellTool;
-import cn.com.victorysoft.business.technology.entity.WellTube;
-import cn.com.victorysoft.business.util.BeanUtils;
-import cn.com.victorysoft.business.util.DateUtils;
-import cn.com.victorysoft.business.util.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 井下工具数据同步服务
- */
-@Slf4j
-@Service
-public class WellTubeDataSyncService {
-
-    @Resource
-    private WellTubeDataSyncDao wellTubeDataSyncDao;
-    @Resource
-    private WellTubeDao wellTubeDao;
-
-    /**
-     * 同步数据
-     */
-    @Transactional
-    public void sync(Date startDate, Date endDate) {
-        String month = DateUtils.format(endDate, "yyyyMM");
-        String prevMonth = DateUtils.format(DateUtils.addMonths(endDate, -1), "yyyyMM");
-        // 查询源头
-        List<WellTube> list = wellTubeDataSyncDao.selectList(startDate, endDate);
-        // 查询工具附录
-        List<Fla55> fla55List = wellTubeDataSyncDao.selectFla55();
-        Map<String, Fla55> fla55Map = fla55List.stream().collect(Collectors.toMap(Fla55::getDm, v -> v));
-        // 查询上月
-        UnitWellMonthPageParam param = new UnitWellMonthPageParam();
-        param.setMonth(prevMonth);
-        List<WellTube> prevMonthList = wellTubeDao.selectList(param);
-        Map<String, WellTube> prevMonthMap = prevMonthList.stream().collect(Collectors.toMap(WellTube::getJh, v -> v));
-        // 合并源头数据和上月数据
-        for (WellTube wellTube : list) {
-            // 工具计算
-            String fgqlx = wellTube.getFgqlx();
-            if (StringUtils.isNotEmpty(fgqlx)) {
-                String[] fgqlxArray = fgqlx.split(",");
-                List<String> fgqlxList = Arrays.asList(fgqlxArray);
-                Map<String, List<Fla55>> fgqlxMap = fgqlxList.stream()
-                        .map(fla55Map::get)
-                        .collect(Collectors.groupingBy(Fla55::getDmmc));
-                List<String> fgqlxmcList = new ArrayList<>();
-                List<String> fgqlxslList = new ArrayList<>();
-                fgqlxMap.forEach((key, value) -> {
-                    fgqlxmcList.add(key);
-                    fgqlxslList.add(String.valueOf(value.size()));
-                });
-                wellTube.setFgqlx(String.join(",", fgqlxmcList));
-                wellTube.setFgqjs(String.join(",", fgqlxslList));
-            }
-            WellTube prevWellTube = prevMonthMap.get(wellTube.getJh());
-            if (prevWellTube != null) {
-                BeanUtils.mergeBean(wellTube, prevWellTube);
-            }
-        }
-        if (list.size() > 0) {
-            // 先删除，后插入
-            wellTubeDao.deleteByMonth(month);
-            // 每批commit的个数
-            int batchCount = 500;
-            int index = 0;
-            do {
-                int batchLastIndex = Math.min(index + batchCount, list.size());
-                List<WellTube> tmp = list.subList(index, batchLastIndex);
-                wellTubeDao.insertBatch(tmp);
-                index = index + batchCount;
-            } while (index < list.size());
-        }
-    }
-
-}

vseaf4.4-calc/src/main/java/cn/com/victorysoft/business/calc/task/DataSyncTask.java

@@ -1,202 +0,0 @@
-package cn.com.victorysoft.business.calc.task;
-
-import cn.com.victorysoft.business.calc.service.*;
-import cn.com.victorysoft.business.sys.entity.DateRange;
-import cn.com.victorysoft.business.util.DateUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * 数据同步任务调度
- */
-@Slf4j
-@Component
-public class DataSyncTask {
-
-    @Value("${data.calc.enabled}")
-    private boolean calcEnabled;
-
-    @Resource
-    private DataSyncService dataSyncService;
-    @Resource
-    private QualityDataSyncService qualityDataSyncService;
-    @Resource
-    private FlushDataSyncService flushDataSyncService;
-    @Resource
-    private AdjustDataSyncService adjustDataSyncService;
-    @Resource
-    private AbnormalDataSyncService abnormalDataSyncService;
-    @Resource
-    private ConditionDataSyncService conditionDataSyncService;
-    @Resource
-    private RealtimeService realtimeService;
-    @Resource
-    private WellToolDataSyncService wellToolDataSyncService;
-    @Resource
-    private WellTubeDataSyncService wellTubeDataSyncService;
-
-    @Scheduled(cron = "0 0 23 * * ?")
-    public void syncStatic() {
-        if (calcEnabled) {
-            log.info("静态数据同步任务开始");
-            dataSyncService.syncStaticData();
-            log.info("静态数据同步任务结束");
-        }
-    }
-
-    /**
-     * 每月同步上月数据，汇总月度数据
-     */
-    @Scheduled(cron = "0 0 6 1,2 * ?")
-    public void syncDaily() {
-        if (calcEnabled) {
-            log.info("日度注水数据同步任务开始");
-            // 本月第一天
-            Date firstDate = DateUtils.truncate(new Date(), Calendar.MONTH);
-            // 上月最后一天
-            Date endDate = DateUtils.addDays(firstDate, -1);
-            // 上月第一天
-            Date startDate = DateUtils.truncate(endDate, Calendar.MONTH);
-            // 报错重跑
-            try {
-                dataSyncService.syncWellSectionDaily(startDate, endDate);
-            } catch (Exception e) {
-                log.error("日度注水数据同步失败", e);
-                dataSyncService.syncWellSectionDaily(startDate, endDate);
-            }
-            log.info("日度注水数据同步任务结束");
-            // 汇总月度数据
-            DateRange dateRange = DateUtils.getLastMonth(new Date());
-            String month = dateRange.getName();
-            dataSyncService.summaryMonth(month);
-        }
-    }
-
-    /**
-     * 每月同步上月数据，包括井下工具和在井管柱-------------
-     */
-    @Scheduled(cron = "0 0 5 1 * ?")
-    public void syncMonth() {
-        if (calcEnabled) {
-            // 本月第一天
-            Date firstDate = DateUtils.truncate(new Date(), Calendar.MONTH);
-            // 上月最后一天
-            Date endDate = DateUtils.addDays(firstDate, -1);
-            // 上月第一天
-            Date startDate = DateUtils.truncate(endDate, Calendar.MONTH);
-            wellToolDataSyncService.sync(startDate, endDate);
-            wellTubeDataSyncService.sync(startDate, endDate);
-        }
-    }
-
-    /**
-     * 每天同步注水日度数据，停用，改为月初统一同步
-     */
-//    @Scheduled(cron = "0 0 20 * * ?")
-    public void syncWaterDailyData() {
-        if (calcEnabled) {
-            Date date = DateUtils.truncate(new Date(), Calendar.DATE);
-
-            log.info("日度注水数据同步任务开始");
-            // 本月第一天
-            Date firstDate = DateUtils.truncate(date, Calendar.MONTH);
-            dataSyncService.syncWellSectionDaily(firstDate, date);
-            log.info("日度注水数据同步任务结束");
-        }
-    }
-
-    /**
-     * 每天同步日度数据-----
-     */
-    @Scheduled(cron = "0 0 14,22 * * ?")
-    public void syncDailyData() {
-        if (calcEnabled) {
-            Date date = DateUtils.truncate(new Date(), Calendar.DATE);
-
-            log.info("水质监测数据同步任务开始");
-            // 30天前
-//            qualityDataSyncService.syncQualityData(DateUtils.addDays(date, -30), date);
-            try {
-                qualityDataSyncService.xchyfxSzjcsj(DateUtils.addDays(date, -30), date);
-            }catch (Exception e) {
-                log.error("水质监测数据同步任务异常", e);
-            }
-            log.info("水质监测同步任务结束");
-
-            log.info("洗井数据同步任务开始");
-            // 2天前
-            try {
-                flushDataSyncService.syncFlushRecord(DateUtils.addDays(date, -30), date);
-            }catch (Exception e) {
-                log.error("洗井数据同步任务异常", e);
-            }
-            log.info("洗井数据同步任务结束");
-
-            log.info("异常井数据同步任务开始");
-            try {
-                abnormalDataSyncService.syncAbnormalWell(date);
-                abnormalDataSyncService.summaryAbnormalUnit(date);
-            }catch (Exception e) {
-                log.error("异常井数据同步任务异常", e);
-            }
-            log.info("异常井数据同步任务结束");
-
-            log.info("单位工况数据汇总任务开始");
-            try {
-                conditionDataSyncService.summary(date);
-            }catch (Exception e) {
-                log.error("单位工况数据同步任务异常", e);
-            }
-            log.info("单位工况数据汇总任务结束");
-        }
-    }
-
-    /**
-     * 每天8点同步注水泵数据
-     */
-    @Scheduled(cron = "0 0 8 * * ?")
-    public void syncPumpData() {
-        if (calcEnabled) {
-            log.info("注水泵数据同步任务开始");
-            realtimeService.syncPumpDeviceList();
-            log.info("注水泵同步任务结束");
-        }
-    }
-
-    /**
-     * 26号生成测调计划，月底再生成一次----------
-     */
-    @Scheduled(cron = "0 0 23 26,28,29,30,31 * ?")
-    public void generateAdjustPlan() {
-        if (calcEnabled) {
-            Calendar calendar = Calendar.getInstance();
-            int day = calendar.get(Calendar.DATE);
-            //如果不是26号，也不是最后一天，返回
-            if (day != 26 && day != calendar.getActualMaximum(Calendar.DATE)) {
-                return;
-            }
-            Date date = DateUtils.truncate(new Date(), Calendar.DATE);
-            log.info("测调数据生成任务开始");
-            adjustDataSyncService.generateAdjustPlan(date);
-            log.info("测调数据生成任务结束");
-        }
-    }
-
-    /**
-     * 每天更新当前月计划的完成情况
-     */
-    @Scheduled(cron = "0 50 23 * * ?")
-    public void finishAdjustPlan() {
-        if (calcEnabled) {
-            log.info("测调数据更新任务开始");
-            adjustDataSyncService.finishAdjustPlan();
-            log.info("测调数据更新任务结束");
-        }
-    }
-}

vseaf4.4-calc/src/main/resources/mapper/AbnormalDataSync.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.victorysoft.business.calc.dao.AbnormalDataSyncDao">
-
-  <insert id="syncAbnormalWell" parameterType="Date">
-    insert into con_abnormal_well
-    (wellname, record_date, unitcode, open_time, last_open_time, trunk_pressure, oil_pressure, casing_pressure, plan_daily_water, daily_water, oil_pressure_diff, water_diff, water_diff_rate, close_reason, type_id, created_on)
-    select t.*,
-    case
-    when (OIL_PRESSURE_DIFF > 2 or OIL_PRESSURE_DIFF &lt; -2) and (WATER_DIFF_RATE > 20 or WATER_DIFF_RATE &lt; -20) then 'BOTH'
-    when (OIL_PRESSURE_DIFF > 2 or OIL_PRESSURE_DIFF &lt; -2) and not (WATER_DIFF_RATE > 20 or WATER_DIFF_RATE &lt; -20) then 'PRESSURE'
-    when not (OIL_PRESSURE_DIFF > 2 or OIL_PRESSURE_DIFF &lt; -2) and (WATER_DIFF_RATE > 20 or WATER_DIFF_RATE &lt; -20) then 'WATER'
-    end TYPE_ID,
-    sysdate
-    from
-    (select
-    a.jh WELLNAME,
-    a.rq RECORD_DATE,
-    a.dwdm UNITCODE,
-    a.scsj OPEN_TIME,
-    b.scsj LAST_OPEN_TIME,
-    a.gxyl TRUNK_PRESSURE,
-    a.yy OIL_PRESSURE,
-    a.ty CASING_PRESSURE,
-    a.rpzsl PLAN_DAILY_WATER,
-    a.rzsl DAILY_WATER,
-    a.yy - c.yy OIL_PRESSURE_DIFF,
-    a.rzsl - c.rzsl WATER_DIFF,
-    decode(c.rzsl, 0, null, round((a.rzsl - c.rzsl)/ c.rzsl * 100, 2)) WATER_DIFF_RATE,
-    (select dmmc from fla15 where dm = a.bzdm) CLOSE_REASON
-    from
-    (select * from ys_dba02 where rq = #{value}) a,
-    (select * from ys_dba02 where rq = #{value} - 1) b,
-    (select jh, avg(yy) yy, avg(rzsl) rzsl from ys_dba02 where rq >= #{value} - 30 and rq &lt;= #{value} group by jh) c
-    where a.jh = b.jh(+)
-    and a.jh = c.jh(+)
-    and a.dwdm is not null) t
-    where OIL_PRESSURE_DIFF > 2 or OIL_PRESSURE_DIFF &lt; -2
-    or WATER_DIFF_RATE > 20 or WATER_DIFF_RATE &lt; -20
-  </insert>
-
-  <insert id="summaryAbnormalUnit">
-    insert into con_abnormal_unit
-    (unitcode, record_date, total_well, open_well, daily_water, pressure, water_abnormal, pressure_abnormal,
-    open_well_diff, daily_water_diff, water_abnormal_diff, pressure_abnormal_diff, summary_date)
-    select a.*,
-    a.OPEN_WELL - b.OPEN_WELL OPEN_WELL_DIFF,
-    a.DAILY_WATER - b.DAILY_WATER DAILY_WATER_DIFF,
-    a.WATER_ABNORMAL - b.WATER_ABNORMAL WATER_ABNORMAL_DIFF,
-    a.PRESSURE_ABNORMAL - b.PRESSURE_ABNORMAL PRESSURE_ABNORMAL_DIFF,
-    sysdate
-    from
-    (select
-    wb.${unitColumn} unitcode,
-    a.rq record_date,
-    count(1) TOTAL_WELL,
-    sum(case when a.scsj > 0 then 1 end) OPEN_WELL,
-    round(sum(a.rzsl), 2) DAILY_WATER,
-    round(avg(a.yy), 2) PRESSURE,
-    sum(case when b.type_id = 'WATER' or b.type_id = 'BOTH' then 1 end) WATER_ABNORMAL,
-    sum(case when b.type_id = 'PRESSURE' or b.type_id = 'BOTH' then 1 end) PRESSURE_ABNORMAL
-    from ys_dba02 a, CON_ABNORMAL_WELL b, water_well_basic wb
-    where a.jh = wb.wellname
-    and a.jh = b.wellname(+)
-    and a.rq = b.record_date(+)
-    and a.rq = #{date}
-    group by wb.${unitColumn}, a.rq) a, con_abnormal_unit b
-    where a.unitcode is not null
-    and a.unitcode = b.unitcode(+)
-    and a.record_date - 1 = b.record_date(+)
-  </insert>
-
-</mapper>

vseaf4.4-calc/src/main/resources/mapper/AdjustDataSync.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.victorysoft.business.calc.dao.AdjustDataSyncDao">
-
-  <insert id="generateAdjustPlan" parameterType="Date">
-    insert into con_adjust_plan
-    (wellname, month, unitcode, work_date, tube_type_id, water_dispenser, inject_time,
-    last_unit, last_date, plan_water1, plan_water2, plan_water3, plan_water4, plan_water5, plan_water6, plan_water7,
-    created_on, purpose_id, dispensing_note, solid_injection)
-    select a.jh wellname, to_char(add_months(#{value}, 1), 'yyyymm') month,
-    (select unitcode from well_basic where wellname = a.jh) unitcode,
-    (select max(wgrq) from ys_ddh01 where jh = a.jh) work_date,
-    b.zsfs tube_type_id,
-    null water_dispenser,
-    c.scsj inject_time,
-    csdwmc last_unit,
-    csrq last_date,
-    b.cdrpzl1 plan_water1,
-    b.cdrpzl2 plan_water2,
-    b.cdrpzl3 plan_water3,
-    b.cdrpzl4 plan_water4,
-    b.cdrpzl5 plan_water5,
-    b.cdrpzl6 plan_water6,
-    b.cdrpzl7 plan_water7,
-    sysdate created_on,
-    '1',
-    b.RPZSL dispensing_note,
-    b.RZSL solid_injection
-    from
-    (select * from (select t.*, row_number() over(partition by jh order by csrq desc) rn from ys_dca09 t where csrq &lt; #{value}) t
-    where rn = 1 and csrq &lt; trunc(add_months(#{value}, -1),'mm')) a,
-    (select * from ys_dba02 where rq = trunc(#{value} - 1)) b,
-    (select jh, sum(scsj) scsj from ys_dba02 where rq >= trunc(#{value}, 'mm') and rq &lt;= #{value} group by jh) c
-    where a.jh = b.jh and a.jh = c.jh and c.scsj > 24
-    and b.zsfs in (select dm from sys_inject_technology where txsg = '0')
-  </insert>
-
-  <update id="finishAdjustPlan">
-    update con_adjust_plan t
-    set finish_date = (select min(csrq) from ys_dca09 where jh = t.wellname and csrq > t.last_date)
-    where exists (select 1 from ys_dca09 where jh = t.wellname and csrq > t.last_date)
-    and finish_date is null
-  </update>
-
-</mapper>

vseaf4.4-calc/src/main/resources/mapper/ConditionDataSync.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.victorysoft.business.calc.dao.ConditionDataSyncDao">
-
-  <insert id="summary">
-    insert into con_condition_unit
-    (unitcode, record_date, normal_well, less_well, more_well, unclear_well, abnormal_well, summary_date)
-    select unitcode, record_date, normal_well, less_well, more_well, unclear_well, abnormal_well, summary_date
-    from v_con_condition_unit
-    where record_date = #{date}
-    and unitcode is not null
-  </insert>
-
-</mapper>

vseaf4.4-calc/src/main/resources/mapper/DataSync.xml

@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.victorysoft.business.calc.dao.DataSyncDao">
-
-  <update id="syncWaterWell">
-    merge into water_well_basic T1
-    USING (SELECT * FROM v_well_basic where well_type like '3%'
-            or wellname in (select jh from ys_dba02 where rq = trunc(sysdate-1))
-            or wellname in (select wellname from water_well_basic)) T2 ON
-        (T1.wellname = t2.wellname)
-    WHEN MATCHED THEN
-      update
-       set blockcode = T2.blockcode,
-           unitcode = T2.unitcode,
-           unitname = T2.unitname,
-           fieldcode = T2.fieldcode,
-           bed = T2.bed,
-           stationcode = T2.stationcode,
-           unitcode_company = T2.unitcode_company,
-           well_type = T2.well_type,
-           unitcode_area = T2.unitcode_area,
-           unitcode_group = T2.unitcode_group
-    WHEN NOT MATCHED THEN
-      insert
-        (wellname, blockcode, unitcode, unitname, fieldcode, bed, stationcode, unitcode_company, well_type, unitcode_area, unitcode_group)
-      values
-        (T2.wellname, T2.blockcode, T2.unitcode, T2.unitname, T2.fieldcode, T2.bed, T2.stationcode, T2.unitcode_company, T2.well_type, T2.unitcode_area, T2.unitcode_group)
-  </update>
-
-  <insert id="syncSingleWellDaily">
-    insert into well_section_daily
-    (wellname, record_date, unitcode, well_type, section, nozzle, pp, pc, pt,
-    plan_daily_water, daily_water, water_well_classify, inject_type_ys, open_time,
-    remark_code, remark_code1, layer, remark, plan_section, well_water)
-    select b.jh wellname, b.rq record_date, c.dwdm unitcode,
-      case
-        when (c.mqjb is null or c.mqjb not like 'X%') and (b.zsmd is null or b.zsmd not in ('边底水驱','消化污水')) then '1'
-        when c.mqjb like 'X%' and (b.zsmd is null or b.zsmd not in ('边底水驱','消化污水')) then '0'
-        when (c.mqjb is null or c.mqjb not like 'X%') and b.zsmd = '消化污水' then '2'
-        when (c.mqjb is null or c.mqjb not like 'X%') and b.zsmd = '边底水驱' then '3'
-        when c.mqjb like 'X%' and b.zsmd = '消化污水' then '4'
-        when c.mqjb like 'X%' and b.zsmd = '边底水驱' then '5'
-      end well_type,
-      1 section, null nozzle, b.gxyl pp, b.ty pc, b.yy pt,
-      b.rpzsl plan_daily_water, b.rzsl daily_water,
-      case when b.bz like '%一类井%' then '1'
-      when b.bz like '%二类井%' then '2'
-      when b.bz like '%三类井%' then '3'
-      when b.bz like '%四类井%' then '4' end water_well_classify,
-      b.zsfs inject_type_ys,
-      b.scsj open_time, b.bzdm remark_code, b.bzdm1 remark_code,
-      b.zscw,
-      b.bz,
-      b.pzcds,
-      b.rzsl
-    from ys_dba02 b
-    left join ys_daa01 c on b.jh = c.jh
-    where b.rq >= #{startDate,jdbcType=TIMESTAMP}
-    and b.rq &lt;= #{endDate,jdbcType=TIMESTAMP}
-    and b.zsfs in
-    <foreach collection="injectCodes" item = "code" open="(" separator="," close=")" index="index">
-      #{code}
-    </foreach>
-  </insert>
-
-  <insert id="syncWellSectionDaily">
-    insert into well_section_daily
-    (wellname, record_date, unitcode, well_type, section, nozzle, pp, pc, pt,
-    plan_daily_water, daily_water, water_well_classify, inject_type_ys, open_time,
-    remark_code, remark_code1, layer, remark, plan_section, well_water)
-    select a.jh wellname, a.rq record_date, c.dwdm unitcode,
-      case
-        when (c.mqjb is null or c.mqjb not like 'X%') and (b.zsmd is null or b.zsmd not in ('边底水驱','消化污水')) then '1'
-        when c.mqjb like 'X%' and (b.zsmd is null or b.zsmd not in ('边底水驱','消化污水')) then '0'
-        when (c.mqjb is null or c.mqjb not like 'X%') and b.zsmd = '消化污水' then '2'
-        when (c.mqjb is null or c.mqjb not like 'X%') and b.zsmd = '边底水驱' then '3'
-        when c.mqjb like 'X%' and b.zsmd = '消化污水' then '4'
-        when c.mqjb like 'X%' and b.zsmd = '边底水驱' then '5'
-      end well_type,
-      a.cdxh section, a.cdsz nozzle, b.gxyl pp, b.ty pc, b.yy pt,
-      a.cdrpsl plan_daily_water, a.cdrzsl daily_water,
-      case when b.bz like '%一类井%' then '1'
-      when b.bz like '%二类井%' then '2'
-      when b.bz like '%三类井%' then '3'
-      when b.bz like '%四类井%' then '4' end water_well_classify,
-      b.zsfs inject_type_ys,
-      b.scsj open_time, b.bzdm remark_code, b.bzdm1 remark_code,
-      a.zscw,
-      b.bz,
-      b.pzcds,
-      b.rzsl
-    from dba021 a
-    inner join ys_dba02 b on a.jh = b.jh and a.rq = b.rq
-    left join ys_daa01 c on a.jh = c.jh
-    where a.rq >= #{startDate,jdbcType=TIMESTAMP}
-    and a.rq &lt;= #{endDate,jdbcType=TIMESTAMP}
-    and b.zsfs in
-    <foreach collection="injectCodes" item = "code" open="(" separator="," close=")" index="index">
-      #{code}
-    </foreach>
-  </insert>
-
-  <select id="selectWellSectionMonthBasic" resultType="WellSectionMonth">
-    select wellname, #{dateRange.name} month, unitcode, well_type, section, nozzle, inject_type, layer, remark
-    from (
-      select t.*, dense_rank() over(partition by wellname order by record_date desc) rn
-      from well_section_daily t
-      where record_date >= #{dateRange.start}
-      and record_date &lt;= #{dateRange.end}
-      <if test="unitcode != null and unitcode != ''">
-        and t.unitcode in (select unitcode from sys_unitinfo start with unitcode = #{unitcode} connect by prior unitcode = p_unitcode)
-      </if>
-    ) t
-    where rn = 1
-  </select>
-
-  <select id="summaryByWell" resultType="WellSectionMonth">
-    select t.*,
-    case when day_num >= 1 and month_water > 0.5 then '1' else '0' end section_open
-    from (select t.wellname, #{dateRange.name} month,
-    sum(well_water) month_water,
-    trunc(sum(open_time)/24, 1) day_num,
-    max(water_well_classify) water_well_classify,
-    case when
-    sum(case when
-    remark like '%大修%' or
-    remark like '%调剖%' or
-    remark like '%挤素%' or
-    remark like '%化堵%' or
-    remark like '%酸化%' or
-    remark like '%示踪剂%'
-    then 1 end) > 0 then '1' else '0' end remark_no_check
-    from
-    (select t.*, row_number() over(partition by wellname, record_date order by section) rn
-    from well_section_daily t
-    where t.record_date >= #{dateRange.start}
-    and t.record_date &lt;= #{dateRange.end}
-    <if test="unitcode != null and unitcode != ''">
-      and t.unitcode in (select unitcode from sys_unitinfo start with unitcode = #{unitcode} connect by prior unitcode = p_unitcode)
-    </if>
-    ) t
-    where rn = 1
-    group by t.wellname) t
-  </select>
-
-  <select id="summaryWellSectionMonth" resultType="WellSectionMonth">
-    select wellname, month, section, pp, pc, pt, daily_water, month_water, day_num,
-    case when day_num > 0 then round(month_water/day_num, 2) end daily_ability,
-    plan_daily_water
-    from (
-      select t.wellname, #{dateRange.name} month, t.section,
-      round(avg(pp), 2) pp, round(avg(pc), 2) pc, round(avg(pt), 2) pt,
-      max(t.plan_daily_water) plan_daily_water,
-      round(avg(daily_water), 2) daily_water,
-      sum(daily_water) month_water,
-      trunc(sum(open_time)/24, 1) day_num
-      from well_section_daily t,
-      (select wellname, section, inject_type_ys, plan_daily_water
-      from (select t.*, row_number() over(partition by wellname, section order by num desc) rn
-      from (select wellname,
-      section,
-      max(inject_type_ys) inject_type_ys,
-      plan_daily_water,
-      count(1) num
-      from (select t.*, rank() over(partition by wellname order by max_date desc) rn
-      from (select t.*, max(record_date) over(partition by wellname, inject_type_ys) max_date
-      from well_section_daily t
-      where record_date >= #{dateRange.start}
-      and record_date &lt;= #{dateRange.end}
-      and open_time > 0 and well_water > 0
-      <if test="unitcode != null and unitcode != ''">
-        and t.unitcode in (select unitcode from sys_unitinfo start with unitcode = #{unitcode} connect by prior unitcode = p_unitcode)
-      </if>
-      ) t)
-      where rn = 1
-      group by wellname, section, plan_daily_water) t) t
-      where rn = 1
-      ) pd
-      where t.record_date >= #{dateRange.start}
-      and t.record_date &lt;= #{dateRange.end}
-      and t.wellname = pd.wellname
-      and t.section = pd.section
-      and t.plan_daily_water = pd.plan_daily_water
-      group by t.wellname, t.section
-    ) t
-  </select>
-
-  <select id="selectInjectTechnology" resultType="SysInjectTechnology">
-    select DM, LB, DMMC, ZSGY, TXSG, FTPD
-    from SYS_INJECT_TECHNOLOGY
-  </select>
-</mapper>

vseaf4.4-calc/src/main/resources/mapper/FlushDataSync.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.victorysoft.business.calc.dao.FlushDataSyncDao">
-
-  <insert id="syncFlushRecord">
-    insert into con_flush_record
-    (wellname, record_date, unitcode, start_time, range_time, in_water, out_water, displacement, reason, type_id, created_on)
-    select jh, rq, dwdm, xjrq, xjys, jksl, cksl, jkpl, xjyy, xjfs, created_on
-    from (select t.*, row_number() over(partition by jh, rq order by xjrq desc) rn
-    from (select jh, trunc(xjrq) rq, dwdm, xjrq, xjys, jksl, cksl, jkpl, xjyy, xjfs, sysdate created_on
-    from YS_DGC12 t
-    where xjrq >= #{startDate} and xjrq &lt; #{endDate} + 1
-    and not exists (select 1 from CON_FLUSH_RECORD where wellname = t.jh and record_date = trunc(t.xjrq))
-    order by jh, xjrq desc) t) t where rn = 1
-  </insert>
-
-  <insert id="insertFlushDaily">
-    insert into CON_FLUSH_DAILY
-    (WELLNAME,
-    RECORD_DATE,
-    UNITCODE,
-    RANGE_TIME,
-    DISPLACEMENT,
-    REASON,
-    TYPE_ID,
-    EFFECTIVE,
-    CREATED_ON,
-    MODIFIED_ON,
-    before_date,
-    BEFORE_PT,
-    BEFORE_PLAN_WATER,
-    BEFORE_WATER,
-    after_date,
-    AFTER_PT,
-    AFTER_PLAN_WATER,
-    AFTER_WATER,
-    AFTER_WATER_RATE)
-    SELECT WELLNAME,
-    RECORD_DATE,
-    UNITCODE,
-    RANGE_TIME,
-    DISPLACEMENT,
-    REASON,
-    TYPE_ID,
-    EFFECTIVE,
-    CREATED_ON,
-    MODIFIED_ON,
-    before_date,
-    A.YY BEFORE_PT,
-    A.RPZSL BEFORE_PLAN_WATER,
-    A.RZSL BEFORE_WATER,
-    after_date,
-    B.YY AFTER_PT,
-    B.RPZSL AFTER_PLAN_WATER,
-    B.RZSL AFTER_WATER,
-    DECODE(B.RPZSL, 0, NULL, ROUND(B.RZSL / B.RPZSL, 2)) AFTER_WATER_RATE
-    from
-    (SELECT t.*,
-    (select max(rq) from YS_DBA02 where jh = t.wellname and rq &lt; t.record_date and scsj = 24) before_date,
-    (select min(rq) from YS_DBA02 where jh = t.wellname and rq > t.record_date and scsj = 24) after_date
-    FROM CON_FLUSH_RECORD T
-    where not exists (select 1 from CON_FLUSH_DAILY where wellname = t.wellname and record_date = t.record_date)
-    ) t
-    LEFT JOIN YS_DBA02 A ON T.WELLNAME = A.JH AND T.before_date = A.RQ
-    LEFT JOIN YS_DBA02 B ON T.WELLNAME = B.JH AND T.after_date = B.RQ
-  </insert>
-
-  <update id="updateFlushDaily">
-    merge into CON_FLUSH_DAILY a
-    using (
-      select WELLNAME,
-      RECORD_DATE,
-      after_date2,
-      B.YY AFTER_PT,
-      B.RPZSL AFTER_PLAN_WATER,
-      B.RZSL AFTER_WATER,
-      DECODE(B.RPZSL, 0, NULL, ROUND(B.RZSL / B.RPZSL, 2)) AFTER_WATER_RATE
-      from
-      (SELECT t.*,
-      (select min(rq) from YS_DBA02 where jh = t.wellname and rq > t.record_date and scsj = 24) after_date2
-      FROM CON_FLUSH_DAILY T
-      where after_date is null
-      ) t
-      JOIN YS_DBA02 B ON T.WELLNAME = B.JH AND T.after_date2 = B.RQ
-    ) t
-    on (a.WELLNAME = t.WELLNAME and a.RECORD_DATE = t.RECORD_DATE)
-    when matched then
-    update set
-    a.after_date = t.after_date2,
-    a.AFTER_PT = t.AFTER_PT,
-    a.AFTER_PLAN_WATER = t.AFTER_PLAN_WATER,
-    a.AFTER_WATER = t.AFTER_WATER,
-    a.AFTER_WATER_RATE = t.AFTER_WATER_RATE
-  </update>
-
-</mapper>

vseaf4.4-calc/src/main/resources/mapper/Index.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.victorysoft.business.calc.dao.IndexDao">
-
-  <select id="selectUnitDaily" parameterType="UnitDateParam" resultType="UnitDaily">
-    select
-    count(1) totalWell,
-    nvl(sum(case when scsj > 0 then 1 end), 0) openWell,
-    nvl(sum(case when sit.zsgy = '单注' then 1 end), 0) singleWell,
-    nvl(sum(case when sit.zsgy = '分注' then 1 end), 0) splitWell,
-    nvl(sum(t.rzsl), 0) dailyWater
-    from ys_dba02 t
-    left join sys_inject_technology sit
-    on t.zsfs = sit.dm
-    where rq = #{testdate}
-    and dwdm in (select unitcode
-    from SYS_UNITINFO
-    start with UNITCODE = #{unitcode}
-    connect by prior UNITCODE = P_UNITCODE)
-  </select>
-
-</mapper>

vseaf4.4-calc/src/main/resources/mapper/QualityDataSync.xml

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.victorysoft.business.calc.dao.QualityDataSyncDao">
-
-  <insert id="syncQualityData">
-    insert into indi_quality_check
-    (object_type, object_name, record_date, unitcode, oil_standard, oil_actual,
-    suspension_standard, suspension_actual, srb_standard, srb_actual, particle_standard, particle_actual,
-    corrosion_standard, corrosion_actual, auxiliary_standard, auxiliary_actual, auxiliary_name, create_on)
-    select
-    b.station_type OBJECT_TYPE,
-    a.jcd OBJECT_NAME,
-    trunc(a.qyrq) RECORD_DATE,
-    b.area_code UNITCODE,
-    30 OIL_STANDARD,
-    a.hyl OIL_ACTUAL,
-    10 SUSPENSION_STANDARD,
-    a.xfgthl SUSPENSION_ACTUAL,
-    null SRB_STANDARD,
-    a.LSYHYJ SRB_ACTUAL,
-    3 PARTICLE_STANDARD,
-    a.XFWKLZJZ PARTICLE_ACTUAL,
-    0.076 CORROSION_STANDARD,
-    a.PJFSL CORROSION_ACTUAL,
-    null AUXILIARY_STANDARD,
-    null AUXILIARY_ACTUAL,
-    null AUXILIARY_NAME,
-    sysdate CREATE_ON
-    from ys_dfc15 a, sys_station b
-    where a.jcd = b.name
-    and a.qyrq >= #{startDate}
-    and a.qyrq &lt; #{endDate} + 1
-    and not exists (select 1 from indi_quality_check where object_name = a.jcd and record_date = trunc(a.qyrq))
-    order by a.qyrq, a.jcd
-  </insert>
-
-  <insert id="szjcsjQualityData">
-    insert into indi_quality_check
-    (object_type, object_name, record_date, unitcode, oil_standard, oil_actual,
-    suspension_standard, suspension_actual, srb_standard, srb_actual, particle_standard, particle_actual,
-    corrosion_standard, corrosion_actual, auxiliary_standard, auxiliary_actual, auxiliary_name, create_on)
-    select
-    'WATER_WELL' OBJECT_TYPE,
-    a.jh OBJECT_NAME,
-    a.syrq RECORD_DATE,
-    b.UNITCODE_AREA UNITCODE,
-    30 OIL_STANDARD,
-    a.hyl OIL_ACTUAL,
-    10 SUSPENSION_STANDARD,
-    a.xfgt SUSPENSION_ACTUAL,
-    null SRB_STANDARD,
-    a.srbj SRB_ACTUAL,
-    3 PARTICLE_STANDARD,
-    a.XFWKLZJZZ PARTICLE_ACTUAL,
-    0.076 CORROSION_STANDARD,
-    a.PJFSL CORROSION_ACTUAL,
-    null AUXILIARY_STANDARD,
-    null AUXILIARY_ACTUAL,
-    null AUXILIARY_NAME,
-    sysdate CREATE_ON
-    from
-    (select a.*, row_number() over(partition by jh, syrq order by syrq) rn from
-    v_ods_xchyfx_szjcsj a
-    where jh is not null
-    and a.syrq >= #{startDate}
-    and a.syrq &lt; #{endDate} + 1) a,
-    water_well_basic b
-    where a.rn = 1
-    and b.UNITCODE_AREA is not null
-    and a.jh = b.wellname
-    and not exists (select 1 from indi_quality_check where object_name = a.jh and record_date = a.syrq)
-    order by a.syrq, a.jh
-  </insert>
-
-  <insert id="xchyfxQualityData">
-    insert into indi_quality_check
-    (object_type, object_name, record_date, unitcode, oil_standard, oil_actual,
-    suspension_standard, suspension_actual, srb_standard, srb_actual, particle_standard, particle_actual,
-    corrosion_standard, corrosion_actual, auxiliary_standard, auxiliary_actual, auxiliary_name, create_on)
-    select
-    b.station_type OBJECT_TYPE,
-    a.zkmc OBJECT_NAME,
-    a.syrq RECORD_DATE,
-    b.area_code UNITCODE,
-    30 OIL_STANDARD,
-    a.hyl OIL_ACTUAL,
-    10 SUSPENSION_STANDARD,
-    a.xfgt SUSPENSION_ACTUAL,
-    null SRB_STANDARD,
-    a.srbj SRB_ACTUAL,
-    3 PARTICLE_STANDARD,
-    a.XFWKLZJZZ PARTICLE_ACTUAL,
-    0.076 CORROSION_STANDARD,
-    a.PJFSL CORROSION_ACTUAL,
-    null AUXILIARY_STANDARD,
-    null AUXILIARY_ACTUAL,
-    null AUXILIARY_NAME,
-    sysdate CREATE_ON
-    from
-    (select a.*, row_number() over(partition by zkmc, syrq order by syrq) rn from
-    v_ods_xchyfx_szjcsj a
-    where zkmc is not null
-    and a.syrq >= #{startDate}
-    and a.syrq &lt; #{endDate} + 1) a,
-    sys_station b
-    where a.rn = 1
-    and a.zkmc = b.name
-    and not exists (select 1 from indi_quality_check where object_name = a.zkmc and record_date = a.SYRQ)
-    order by a.SYRQ, a.zkmc
-  </insert>
-
-</mapper>

vseaf4.4-calc/src/main/resources/mapper/WellToolDataSync.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.victorysoft.business.calc.dao.WellToolDataSyncDao">
-
-  <select id="selectList" resultType="WellTool" fetchSize="20000">
-    select t1.jh,
-    t1.ny,
-    t1.zscw,
-    t1.kgzt,
-    (select dmmc from fla15 where dm = t1.bzdm) tzyy,
-    t2.zyrq,
-    t2.zymd,
-    t2.szgd,
-    t2.csqkms,
-    t2.yjylx,
-    t2.yjyyl
-    from (select jh,
-    to_char(#{endDate}, 'yyyymm') ny,
-    max(zscw) zscw,
-    case
-    when sum(scsj) > 24 and sum(rzsl) >= 0.5 then
-    '开井'
-    else
-    '停井'
-    end kgzt,
-    max(bzdm) bzdm
-    from ys_dba02 t
-    where rq between #{startDate} and #{endDate}
-    group by jh) t1
-    left join (select a.jh,
-    max(a.wgrq) zyrq,
-    max((select dmmc from fla16 where dm = a.cslb)) zymd,
-    max(b.szgd) szgd,
-    max(b.fcwms) csqkms,
-    max((select dmmc from fla81 where dm = c.yjydm)) yjylx,
-    max(c.yjyyl) yjyyl
-    from (select t.*,
-    row_number() over(partition by jh order by wgrq desc) rn
-    from ys_ddh01 t
-    where wgrq &lt;= #{endDate}) a
-    left join ys_ddb06 b on a.jh = b.jh
-    and a.wgrq = b.wgrq
-    left join ys_ddb02 c on a.jh = c.jh
-    and a.wgrq = c.wgrq
-    where rn = 1 group by a.jh) t2 on t1.jh = t2.jh
-  </select>
-
-</mapper>

vseaf4.4-calc/src/main/resources/mapper/WellTubeDataSync.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.victorysoft.business.calc.dao.WellTubeDataSyncDao">
-
-  <select id="selectList" resultType="WellTube" fetchSize="20000">
-    select t1.jh,
-    t1.ny,
-    t1.zscw,
-    case when t1.scsj > 24 and rzsl >= 0.5 then '开井' else '停井' end kgzt,
-    (select dmmc from fla15 where dm = t1.bzdm) tzyy,
-    t2.ygcd,
-    t2.ygxrrq,
-    t2.fgqlx
-    from (select jh,
-    to_char(#{endDate}, 'yyyymm') ny,
-    max(zscw) zscw,
-    sum(scsj) scsj,
-    sum(rzsl) rzsl,
-    max(bzdm) bzdm
-    from ys_dba02 t
-    where rq between #{startDate} and #{endDate}
-    group by jh) t1
-    left join (select a.jh,
-    sum(case when a.gzxl = 0 and b.lb = '油管' then cd end) ygcd,
-    max(a.sgrq) ygxrrq,
-    listagg(case when b.lb = '封隔器' then a.gjdm end, ',') within group(order by a.xrxh) fgqlx
-    from (select t.*,
-    dense_rank() over(partition by jh order by wgrq desc) rn
-    from ys_ddh013 t
-    where wgrq &lt;= #{endDate}) a
-    left join fla55 b on a.gjdm = b.dm
-    where rn = 1 group by a.jh) t2 on t1.jh = t2.jh
-  </select>
-
-  <select id="selectFla55" resultType="Fla55">
-    select * from fla55
-  </select>
-
-</mapper>

vseaf4.4-calc/src/test/java/cn/com/victorysoft/Test.java

@@ -1,11 +0,0 @@
-package cn.com.victorysoft;
-
-import cn.com.victorysoft.business.util.DateUtils;
-import lombok.SneakyThrows;
-
-public class Test {
-    @SneakyThrows
-    public static void main(String[] args) {
-        System.out.println(DateUtils.getMonthRange(DateUtils.parseDate("202103", "yyyyMM")));
-    }
-}

vseaf4.4-condition/pom.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>cn.com.victorysoft</groupId>
-	<artifactId>vseaf4.4-condition</artifactId>
-	<packaging>jar</packaging>
-
-	<parent>
-		<groupId>cn.com.victorysoft</groupId>
-		<artifactId>vseaf-service-template</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.victorysoft</groupId>
-			<artifactId>vseaf4.4-sys</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
-
-</project>

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/controller/AbnormalUnitController.java

@@ -1,47 +0,0 @@
-package cn.com.victorysoft.business.condition.controller;
-
-import cn.com.victorysoft.business.condition.entity.AbnormalUnit;
-import cn.com.victorysoft.business.condition.entity.WaterRealtime;
-import cn.com.victorysoft.business.condition.service.AbnormalUnitService;
-import cn.com.victorysoft.business.condition.service.WaterRealtimeService;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.sys.param.UnitDatePageExportParam;
-import cn.com.victorysoft.business.sys.param.UnitDatePageParam;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-@Api(tags = "异常井单位统计")
-@RestController
-@RequestMapping("condition/abnormalUnit")
-public class AbnormalUnitController {
-    @Resource
-    private AbnormalUnitService abnormalUnitService;
-    @Resource
-    private WaterRealtimeService waterRealtimeService;
-
-    @GetMapping("/list")
-    @ApiOperation("查询本单位及子单位数据")
-    public List<AbnormalUnit> list(UnitDatePageParam param) {
-        return abnormalUnitService.selectUnitChildren(param);
-    }
-
-    @PostMapping("/export")
-    @ApiOperation("导出数据")
-    public ExportResult export(@RequestBody UnitDatePageExportParam param) {
-        List<AbnormalUnit> list = abnormalUnitService.selectUnitChildren(param);
-        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
-    }
-
-    @GetMapping("/realtime")
-    @ApiOperation("水井实时数据")
-    public List<WaterRealtime> realtime(String wellname, Date startDate, Date endDate) {
-        return waterRealtimeService.getData(wellname, startDate, endDate);
-    }
-
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/controller/AbnormalWellController.java

@@ -1,64 +0,0 @@
-package cn.com.victorysoft.business.condition.controller;
-
-import cn.com.victorysoft.business.condition.entity.AbnormalWell;
-import cn.com.victorysoft.business.condition.param.AbnormalWellExportParam;
-import cn.com.victorysoft.business.condition.param.AbnormalWellParam;
-import cn.com.victorysoft.business.condition.service.AbnormalWellService;
-import cn.com.victorysoft.business.condition.service.AbnormalWellService;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.sys.param.UnitBlockDateWellExportParam;
-import cn.com.victorysoft.business.sys.param.UnitBlockDateWellPageParam;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Api(tags = "异常井")
-@RestController
-@RequestMapping("condition/abnormalWell")
-public class AbnormalWellController {
-    @Resource
-    private AbnormalWellService abnormalWellService;
-
-    @GetMapping("/page")
-    @ApiOperation("查询分页数据")
-    public PageInfo<AbnormalWell> Page(AbnormalWellParam param) {
-        return abnormalWellService.selectPage(param);
-    }
-
-    @PostMapping("/export")
-    @ApiOperation("导出数据")
-    public ExportResult selectListExport(@RequestBody AbnormalWellExportParam param) {
-        List<AbnormalWell> list = abnormalWellService.selectList(param);
-        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
-    }
-
-    @PostMapping("/insert")
-    @ApiOperation("更新")
-    public int insert(@RequestBody AbnormalWell param) {
-        AbnormalWell record = abnormalWellService.selectByPrimaryKey(param);
-        if (record != null) {
-            return -1;
-        }else {
-            return abnormalWellService.insert(param);
-        }
-
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("更新")
-    public int update(@RequestBody AbnormalWell param) {
-        return abnormalWellService.update(param);
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除")
-    public int delete(AbnormalWell param) {
-        return abnormalWellService.delete(param);
-    }
-
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/controller/AbnormalWellReasonController.java

@@ -1,55 +0,0 @@
-package cn.com.victorysoft.business.condition.controller;
-
-import cn.com.victorysoft.business.condition.entity.AbnormalWellReason;
-import cn.com.victorysoft.business.condition.param.AbnormalWellReasonExportParam;
-import cn.com.victorysoft.business.condition.param.AbnormalWellReasonParam;
-import cn.com.victorysoft.business.condition.service.AbnormalWellReasonService;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Api(tags = "异常井原因分析")
-@RestController
-@RequestMapping("condition/abnormalWellReason")
-public class AbnormalWellReasonController {
-    @Resource
-    private AbnormalWellReasonService abnormalWellReasonService;
-
-    @GetMapping("/page")
-    @ApiOperation("查询分页数据")
-    public PageInfo<AbnormalWellReason> Page(AbnormalWellReasonParam param) {
-        return abnormalWellReasonService.selectPage(param);
-    }
-
-    @PostMapping("/export")
-    @ApiOperation("导出数据")
-    public ExportResult selectListExport(@RequestBody AbnormalWellReasonExportParam param) {
-        List<AbnormalWellReason> list = abnormalWellReasonService.selectList(param);
-        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
-    }
-
-    @PostMapping("/save")
-    @ApiOperation("保存")
-    public int insert(@RequestBody AbnormalWellReason param) {
-        AbnormalWellReason record = abnormalWellReasonService.selectByPrimaryKey(param);
-        if (record != null) {
-            return abnormalWellReasonService.update(param);
-        }else {
-            return abnormalWellReasonService.insert(param);
-        }
-
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除")
-    public int delete(AbnormalWellReason param) {
-        return abnormalWellReasonService.delete(param);
-    }
-
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/controller/AdjustPlanController.java

@@ -1,107 +0,0 @@
-package cn.com.victorysoft.business.condition.controller;
-
-import cn.com.victorysoft.business.condition.dto.AdjustPlanSummary;
-import cn.com.victorysoft.business.condition.dto.AdjustPlanSummaryType;
-import cn.com.victorysoft.business.condition.entity.AdjustPlan;
-import cn.com.victorysoft.business.condition.entity.Gzlx;
-import cn.com.victorysoft.business.condition.param.AdjustPlanExportParam;
-import cn.com.victorysoft.business.condition.param.AdjustPlanParam;
-import cn.com.victorysoft.business.condition.param.GzlxParam;
-import cn.com.victorysoft.business.condition.service.AdjustPlanService;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.sys.param.*;
-import cn.com.victorysoft.business.util.DateUtils;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.SneakyThrows;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-@Api(tags = "分注井测调计划安排")
-@RestController
-@RequestMapping("condition/adjustPlan")
-public class AdjustPlanController {
-    @Resource
-    private AdjustPlanService adjustPlanService;
-
-    @GetMapping("/page")
-    @ApiOperation("查询分页数据")
-    public PageInfo<AdjustPlan> Page(AdjustPlanParam param) {
-        return adjustPlanService.selectPage(param);
-    }
-
-    @GetMapping("/gzlx")
-    @ApiOperation("查询管柱类型")
-    public List<Gzlx> selectGzlx(GzlxParam param) {
-        return adjustPlanService.selectGzlx(param);
-    }
-
-    @SneakyThrows
-    @PostMapping("/export")
-    @ApiOperation("导出数据")
-    public ExportResult selectListExport(@RequestBody AdjustPlanExportParam param) {
-        List<AdjustPlan> list = adjustPlanService.selectList(param);
-        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
-    }
-
-    @PostMapping("/insert")
-    @ApiOperation("插入")
-    public int insert(@RequestBody AdjustPlan param) {
-        AdjustPlan record = adjustPlanService.selectByPrimaryKey(param);
-        if (record != null) {
-            return -1;
-        } else {
-            return adjustPlanService.insert(param);
-        }
-
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("更新")
-    public int update(@RequestBody AdjustPlan param) {
-        return adjustPlanService.update(param);
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除")
-    public int delete(AdjustPlan param) {
-        return adjustPlanService.delete(param);
-    }
-
-    @GetMapping("/generate")
-    @ApiOperation("根据井号生成数据")
-    public AdjustPlan generate(String wellname, String month) {
-        return adjustPlanService.generateByWellname(wellname, month);
-    }
-
-    @GetMapping("/summary")
-    @ApiOperation("测调完成情况")
-    public List<AdjustPlanSummary> summary(UnitMonthParam param) {
-        return adjustPlanService.summary(param);
-    }
-
-    @SneakyThrows
-    @GetMapping("/summaryType")
-    @ApiOperation("上月测调完成情况分类")
-    public List<AdjustPlanSummaryType> summaryType(UnitMonthParam param) {
-        // 取上月
-        Date firstDate = DateUtils.parseDate(param.getMonth() + "01", "yyyyMMdd");
-        // 上月最后一天
-        Date endDate = DateUtils.addDays(firstDate, -1);
-        param.setMonth(DateUtils.format(endDate, "yyyyMM"));
-        return adjustPlanService.summaryType(param);
-    }
-
-    @PostMapping("/summaryTypeExport")
-    @ApiOperation("测调完成情况分类导出")
-    public ExportResult summaryTypeExport(@RequestBody UnitMonthExportParam param) {
-        List<AdjustPlanSummaryType> list = this.summaryType(param);
-        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
-    }
-
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/controller/AdjustRecordController.java

@@ -1,63 +0,0 @@
-package cn.com.victorysoft.business.condition.controller;
-
-import cn.com.victorysoft.business.condition.entity.AdjustRecord;
-import cn.com.victorysoft.business.condition.service.AdjustRecordService;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.sys.param.UnitBlockDateWellExportParam;
-import cn.com.victorysoft.business.sys.param.UnitBlockDateWellPageParam;
-import cn.com.victorysoft.business.sys.param.UnitBlockWellExportParam;
-import cn.com.victorysoft.business.sys.param.UnitBlockWellPageParam;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Api(tags = "分注井测调过程管理")
-@RestController
-@RequestMapping("condition/adjustRecord")
-public class AdjustRecordController {
-    @Resource
-    private AdjustRecordService adjustRecordService;
-
-    @GetMapping("/page")
-    @ApiOperation("查询分页数据")
-    public PageInfo<AdjustRecord> Page(UnitBlockWellPageParam param) {
-        return adjustRecordService.selectPage(param);
-    }
-
-    @PostMapping("/export")
-    @ApiOperation("导出数据")
-    public ExportResult selectListExport(@RequestBody UnitBlockWellExportParam param) {
-        List<AdjustRecord> list = adjustRecordService.selectList(param);
-        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
-    }
-
-    @PostMapping("/insert")
-    @ApiOperation("更新")
-    public int insert(@RequestBody AdjustRecord param) {
-        AdjustRecord record = adjustRecordService.selectByPrimaryKey(param);
-        if (record != null) {
-            return -1;
-        }else {
-            return adjustRecordService.insert(param);
-        }
-
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("更新")
-    public int update(@RequestBody AdjustRecord param) {
-        return adjustRecordService.update(param);
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除")
-    public int delete(AdjustRecord param) {
-        return adjustRecordService.delete(param);
-    }
-
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/controller/ConditionUnitController.java

@@ -1,36 +0,0 @@
-package cn.com.victorysoft.business.condition.controller;
-
-import cn.com.victorysoft.business.condition.entity.ConditionUnit;
-import cn.com.victorysoft.business.condition.service.ConditionUnitService;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.sys.param.UnitDatePageExportParam;
-import cn.com.victorysoft.business.sys.param.UnitDatePageParam;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Api(tags = "注水井工况单位统计")
-@RestController
-@RequestMapping("condition/conditionUnit")
-public class ConditionUnitController {
-    @Resource
-    private ConditionUnitService unitDailyService;
-
-    @GetMapping("/list")
-    @ApiOperation("查询本单位及子单位数据")
-    public List<ConditionUnit> list(UnitDatePageParam param) {
-        return unitDailyService.selectUnitChildren(param);
-    }
-
-    @PostMapping("/export")
-    @ApiOperation("导出数据")
-    public ExportResult export(@RequestBody UnitDatePageExportParam param) {
-        List<ConditionUnit> list = unitDailyService.selectUnitChildren(param);
-        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
-    }
-
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/controller/ConditionWellController.java

@@ -1,61 +0,0 @@
-package cn.com.victorysoft.business.condition.controller;
-
-import cn.com.victorysoft.business.condition.entity.ConditionWell;
-import cn.com.victorysoft.business.condition.param.ConditionWellExportParam;
-import cn.com.victorysoft.business.condition.param.ConditionWellParam;
-import cn.com.victorysoft.business.condition.service.ConditionWellService;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Api(tags = "注水井工况信息")
-@RestController
-@RequestMapping("condition/conditionWell")
-public class ConditionWellController {
-    @Resource
-    private ConditionWellService conditionWellService;
-
-    @GetMapping("/page")
-    @ApiOperation("查询分页数据")
-    public PageInfo<ConditionWell> Page(ConditionWellParam param) {
-        return conditionWellService.selectPage(param);
-    }
-
-    @PostMapping("/export")
-    @ApiOperation("导出数据")
-    public ExportResult selectListExport(@RequestBody ConditionWellExportParam param) {
-        List<ConditionWell> list = conditionWellService.selectList(param);
-        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
-    }
-
-    @PostMapping("/insert")
-    @ApiOperation("更新")
-    public int insert(@RequestBody ConditionWell param) {
-        ConditionWell record = conditionWellService.selectByPrimaryKey(param);
-        if (record != null) {
-            return -1;
-        }else {
-            return conditionWellService.insert(param);
-        }
-
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("更新")
-    public int update(@RequestBody ConditionWell param) {
-        return conditionWellService.update(param);
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除")
-    public int delete(ConditionWell param) {
-        return conditionWellService.delete(param);
-    }
-
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/controller/FlushDailyController.java

@@ -1,77 +0,0 @@
-package cn.com.victorysoft.business.condition.controller;
-
-import cn.com.victorysoft.business.condition.entity.FlushDaily;
-import cn.com.victorysoft.business.condition.param.FlushDailyExportParam;
-import cn.com.victorysoft.business.condition.param.FlushDailyParam;
-import cn.com.victorysoft.business.condition.service.FlushDailyService;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.util.DateUtils;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.beanutils.converters.BigDecimalConverter;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Api(tags = "洗井日报")
-@RestController
-@RequestMapping("condition/flushDaily")
-public class FlushDailyController {
-    @Resource
-    private FlushDailyService flushDailyService;
-
-    @GetMapping("/page")
-    @ApiOperation("查询分页数据")
-    public PageInfo<FlushDaily> Page(FlushDailyParam param) {
-        return flushDailyService.selectPage(param);
-    }
-
-    @PostMapping("/export")
-    @ApiOperation("导出数据")
-    public ExportResult selectListExport(@RequestBody FlushDailyExportParam param) {
-        List<FlushDaily> list = flushDailyService.selectList(param);
-
-        if (param.getAddress() != null){
-            for (int i = 0; i < list.size(); i++) {
-                list.get(i).setNum(new BigDecimal(i + 1));
-                list.get(i).setNy(DateUtils.format(list.get(i).getRecordDate(), "MM"));
-                if (list.get(i).getAfterPt() == null) {
-                    list.get(i).setAfterPt(new BigDecimal(0));
-                }
-                if (list.get(i).getBeforePt() == null) {
-                    list.get(i).setBeforePt(new BigDecimal(0));
-                }
-                list.get(i).setComparePt(list.get(i).getAfterPt().subtract(list.get(i).getBeforePt()));
-                if (list.get(i).getAfterPlanWater() == null) {
-                    list.get(i).setAfterPlanWater(new BigDecimal(0));
-                }
-                if (list.get(i).getBeforePlanWater() == null) {
-                    list.get(i).setBeforePlanWater(new BigDecimal(0));
-                }
-                list.get(i).setComparePlanWater(list.get(i).getAfterPlanWater().subtract(list.get(i).getBeforePlanWater()));
-                if (list.get(i).getAfterWater() == null) {
-                    list.get(i).setAfterWater(new BigDecimal(0));
-                }
-                if (list.get(i).getBeforeWater() == null) {
-                    list.get(i).setBeforeWater(new BigDecimal(0));
-                }
-                list.get(i).setCompareWater(list.get(i).getAfterWater().subtract(list.get(i).getBeforeWater()));
-            }
-        }else {
-
-        }
-        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
-    }
-
-    @PutMapping("/update")
-    @ApiOperation("更新")
-    public int update(@RequestBody FlushDaily param) {
-        return flushDailyService.update(param);
-    }
-
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/controller/FlushRecordController.java

@@ -1,62 +0,0 @@
-package cn.com.victorysoft.business.condition.controller;
-
-import cn.com.victorysoft.business.condition.entity.FlushRecord;
-import cn.com.victorysoft.business.condition.service.FlushRecordService;
-import cn.com.victorysoft.business.sys.entity.ExportResult;
-import cn.com.victorysoft.business.sys.param.UnitDatePageExportParam;
-import cn.com.victorysoft.business.sys.param.UnitDatePageParam;
-import cn.com.victorysoft.business.util.ExcelUtils;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Api(tags = "洗井运行")
-@RestController
-@RequestMapping("condition/flushRecord")
-public class FlushRecordController {
-    @Resource
-    private FlushRecordService flushRecordService;
-
-    @GetMapping("/page")
-    @ApiOperation("查询分页数据")
-    public PageInfo<FlushRecord> Page(UnitDatePageParam param) {
-        return flushRecordService.selectPage(param);
-    }
-
-    @PostMapping("/export")
-    @ApiOperation("导出数据")
-    public ExportResult selectListExport(@RequestBody UnitDatePageExportParam param) {
-        List<FlushRecord> list = flushRecordService.selectList(param);
-        return ExcelUtils.export(param.getColumnConfig(), list, param.getFileName());
-    }
-
-    @PostMapping("/insert")
-    @ApiOperation("更新")
-    public int insert(@RequestBody FlushRecord param) {
-        FlushRecord record = flushRecordService.selectByPrimaryKey(param);
-        if (record != null) {
-            return -1;
-        }else {
-            return flushRecordService.insert(param);
-        }
-
-    }
-
-
-    @PutMapping("/update")
-    @ApiOperation("更新")
-    public int update(@RequestBody FlushRecord param) {
-        return flushRecordService.update(param);
-    }
-
-    @DeleteMapping("/delete")
-    @ApiOperation("删除")
-    public int delete(FlushRecord param) {
-        return flushRecordService.delete(param);
-    }
-
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/dao/AbnormalUnitDao.java

@@ -1,30 +0,0 @@
-package cn.com.victorysoft.business.condition.dao;
-
-import cn.com.victorysoft.business.condition.entity.AbnormalUnit;
-import cn.com.victorysoft.business.condition.entity.AdjustPlan;
-import cn.com.victorysoft.business.sys.param.UnitBlockDateWellPageParam;
-import cn.com.victorysoft.business.sys.param.UnitDatePageParam;
-import cn.com.victorysoft.business.sys.param.UnitDateParam;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Date;
-import java.util.List;
-
-@Mapper
-public interface AbnormalUnitDao {
-    AbnormalUnit selectUnit(UnitDatePageParam param);
-
-    List<AbnormalUnit> selectChildren(UnitDatePageParam param);
-
-    int deleteByPrimaryKey(AbnormalUnit key);
-
-    int deleteByDate(Date date);
-
-    int insert(AbnormalUnit record);
-
-    AbnormalUnit selectByPrimaryKey(AbnormalUnit key);
-
-    int updateByPrimaryKeySelective(AbnormalUnit record);
-
-    int updateByPrimaryKey(AbnormalUnit record);
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/dao/AbnormalWellDao.java

@@ -1,27 +0,0 @@
-package cn.com.victorysoft.business.condition.dao;
-
-import cn.com.victorysoft.business.condition.entity.AbnormalWell;
-import cn.com.victorysoft.business.condition.entity.AdjustRecord;
-import cn.com.victorysoft.business.condition.param.AbnormalWellParam;
-import cn.com.victorysoft.business.sys.param.UnitBlockWellPageParam;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Date;
-import java.util.List;
-
-@Mapper
-public interface AbnormalWellDao {
-    List<AbnormalWell> selectList(AbnormalWellParam param);
-
-    int deleteByPrimaryKey(AbnormalWell key);
-
-    int deleteByDate(Date date);
-
-    int insert(AbnormalWell record);
-
-    AbnormalWell selectByPrimaryKey(AbnormalWell key);
-
-    int updateByPrimaryKeySelective(AbnormalWell record);
-
-    int updateByPrimaryKey(AbnormalWell record);
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/dao/AbnormalWellReasonDao.java

@@ -1,22 +0,0 @@
-package cn.com.victorysoft.business.condition.dao;
-
-import cn.com.victorysoft.business.condition.entity.AbnormalWellReason;
-import cn.com.victorysoft.business.condition.param.AbnormalWellReasonParam;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface AbnormalWellReasonDao {
-    List<AbnormalWellReason> selectList(AbnormalWellReasonParam param);
-
-    int deleteByPrimaryKey(AbnormalWellReason key);
-
-    int insert(AbnormalWellReason record);
-
-    AbnormalWellReason selectByPrimaryKey(AbnormalWellReason key);
-
-    int updateByPrimaryKeySelective(AbnormalWellReason record);
-
-    int updateByPrimaryKey(AbnormalWellReason record);
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/dao/AdjustPlanDao.java

@@ -1,38 +0,0 @@
-package cn.com.victorysoft.business.condition.dao;
-
-import cn.com.victorysoft.business.condition.dto.AdjustPlanSummary;
-import cn.com.victorysoft.business.condition.dto.AdjustPlanSummaryType;
-import cn.com.victorysoft.business.condition.entity.AdjustPlan;
-import cn.com.victorysoft.business.condition.entity.Gzlx;
-import cn.com.victorysoft.business.condition.param.GzlxParam;
-import cn.com.victorysoft.business.sys.param.UnitBlockMonthWellPageParam;
-import cn.com.victorysoft.business.sys.param.UnitMonthParam;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface AdjustPlanDao {
-    List<AdjustPlan> selectList(UnitBlockMonthWellPageParam param);
-
-    List<Gzlx> selectGzlx(GzlxParam param);
-
-    int deleteByPrimaryKey(AdjustPlan key);
-
-    int deleteByMonth(String month);
-
-    int insert(AdjustPlan record);
-
-    AdjustPlan selectByPrimaryKey(AdjustPlan key);
-
-    int updateByPrimaryKeySelective(AdjustPlan record);
-
-    int updateByPrimaryKey(AdjustPlan record);
-
-    AdjustPlan generateByWellname(@Param("wellname") String wellname, @Param("month") String month);
-
-    List<AdjustPlanSummary> summary(@Param("param") UnitMonthParam param, @Param("unitColumn") String unitColumn);
-
-    List<AdjustPlanSummaryType> summaryType(@Param("param") UnitMonthParam param, @Param("unitColumn") String unitColumn);
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/dao/AdjustRecordDao.java

@@ -1,22 +0,0 @@
-package cn.com.victorysoft.business.condition.dao;
-
-import cn.com.victorysoft.business.condition.entity.AdjustRecord;
-import cn.com.victorysoft.business.sys.param.UnitBlockWellPageParam;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface AdjustRecordDao {
-    List<AdjustRecord> selectList(UnitBlockWellPageParam param);
-
-    int deleteByPrimaryKey(AdjustRecord key);
-
-    int insert(AdjustRecord record);
-
-    AdjustRecord selectByPrimaryKey(AdjustRecord key);
-
-    int updateByPrimaryKeySelective(AdjustRecord record);
-
-    int updateByPrimaryKey(AdjustRecord record);
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/dao/ConditionUnitDao.java

@@ -1,27 +0,0 @@
-package cn.com.victorysoft.business.condition.dao;
-
-import cn.com.victorysoft.business.condition.entity.ConditionUnit;
-import cn.com.victorysoft.business.sys.param.UnitDatePageParam;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Date;
-import java.util.List;
-
-@Mapper
-public interface ConditionUnitDao {
-    ConditionUnit selectUnit(UnitDatePageParam param);
-
-    List<ConditionUnit> selectChildren(UnitDatePageParam param);
-
-    int deleteByPrimaryKey(ConditionUnit key);
-
-    int deleteByDate(Date date);
-
-    int insert(ConditionUnit record);
-
-    ConditionUnit selectByPrimaryKey(ConditionUnit key);
-
-    int updateByPrimaryKeySelective(ConditionUnit record);
-
-    int updateByPrimaryKey(ConditionUnit record);
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/dao/ConditionWellDao.java

@@ -1,22 +0,0 @@
-package cn.com.victorysoft.business.condition.dao;
-
-import cn.com.victorysoft.business.condition.entity.ConditionWell;
-import cn.com.victorysoft.business.condition.param.ConditionWellParam;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface ConditionWellDao {
-    List<ConditionWell> selectList(ConditionWellParam param);
-
-    int deleteByPrimaryKey(ConditionWell key);
-
-    int insert(ConditionWell record);
-
-    ConditionWell selectByPrimaryKey(ConditionWell key);
-
-    int updateByPrimaryKeySelective(ConditionWell record);
-
-    int updateByPrimaryKey(ConditionWell record);
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/dao/FlushDailyDao.java

@@ -1,22 +0,0 @@
-package cn.com.victorysoft.business.condition.dao;
-
-import cn.com.victorysoft.business.condition.entity.FlushDaily;
-import cn.com.victorysoft.business.condition.param.FlushDailyParam;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface FlushDailyDao {
-    List<FlushDaily> selectList(FlushDailyParam param);
-
-    int deleteByPrimaryKey(FlushDaily key);
-
-    int insert(FlushDaily record);
-
-    FlushDaily selectByPrimaryKey(FlushDaily key);
-
-    int updateByPrimaryKeySelective(FlushDaily record);
-
-    int updateByPrimaryKey(FlushDaily record);
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/dao/FlushRecordDao.java

@@ -1,22 +0,0 @@
-package cn.com.victorysoft.business.condition.dao;
-
-import cn.com.victorysoft.business.condition.entity.FlushRecord;
-import cn.com.victorysoft.business.sys.param.UnitDatePageParam;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface FlushRecordDao {
-    List<FlushRecord> selectList(UnitDatePageParam param);
-
-    int deleteByPrimaryKey(FlushRecord key);
-
-    int insert(FlushRecord record);
-
-    FlushRecord selectByPrimaryKey(FlushRecord key);
-
-    int updateByPrimaryKeySelective(FlushRecord record);
-
-    int updateByPrimaryKey(FlushRecord record);
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/dto/AdjustPlanSummary.java

@@ -1,20 +0,0 @@
-package cn.com.victorysoft.business.condition.dto;
-
-import lombok.Data;
-
-@Data
-public class AdjustPlanSummary {
-
-    private String unitcode;
-    private String unitname;
-    private String unitlevel;
-    private Integer planNum;
-    private Integer finishNum;
-    private Double finishRate;
-    private Integer splitPlanNum;
-    private Integer splitFinishNum;
-    private Double splitFinishRate;
-    private Integer singlePlanNum;
-    private Integer singleFinishNum;
-    private Double singleFinishRate;
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/dto/AdjustPlanSummaryType.java

@@ -1,20 +0,0 @@
-package cn.com.victorysoft.business.condition.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class AdjustPlanSummaryType {
-
-    private String month;
-    private String unitcode;
-    private String unitname;
-    private String unitlevel;
-    private Integer splitPlanNum;
-    private Integer splitFinishNum;
-    private Integer singlePlanNum;
-    private Integer singleFinishNum;
-    private Integer planNum;
-    private Integer finishNum;
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/entity/AbnormalUnit.java

@@ -1,91 +0,0 @@
-package cn.com.victorysoft.business.condition.entity;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * @author 
- * 异常井单位统计
- */
-@Data
-public class AbnormalUnit implements Serializable {
-    /**
-     * 单位代码
-     */
-    private String unitcode;
-    private String unitname;
-
-    /**
-     * 日期
-     */
-    private Date recordDate;
-
-    /**
-     * 总井数
-     */
-    private Integer totalWell;
-
-    /**
-     * 开井数
-     */
-    private Integer openWell;
-
-    /**
-     * 日注水量
-     */
-    private BigDecimal dailyWater;
-
-    /**
-     * 日注水量
-     */
-    private BigDecimal pressure;
-
-    /**
-     * 异常井
-     */
-    private Integer abnormal;
-
-    /**
-     * 水量异常井
-     */
-    private Integer waterAbnormal;
-
-    /**
-     * 压力异常井
-     */
-    private Integer pressureAbnormal;
-
-    /**
-     * 开井数-比昨
-     */
-    private Integer openWellDiff;
-
-    /**
-     * 异常井-比昨
-     */
-    private Integer abnormalDiff;
-
-    /**
-     * 日注水量-比昨
-     */
-    private BigDecimal dailyWaterDiff;
-
-    /**
-     * 水量异常井-比昨
-     */
-    private Integer waterAbnormalDiff;
-
-    /**
-     * 压力异常井-比昨
-     */
-    private Integer pressureAbnormalDiff;
-
-    /**
-     * 统计时间
-     */
-    private Date summaryDate;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/entity/AbnormalWell.java

@@ -1,119 +0,0 @@
-package cn.com.victorysoft.business.condition.entity;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * @author 
- * 异常井
- */
-@Data
-public class AbnormalWell implements Serializable {
-    /**
-     * 井号
-     */
-    private String wellname;
-
-    /**
-     * 日期
-     */
-    private Date recordDate;
-
-    /**
-     * 单位代码
-     */
-    private String unitcode;
-    private String unitname;
-
-    private String fullname;
-
-    /**
-     * 单元名称
-     */
-    private String blockname;
-
-    /**
-     * 管理区
-     */
-    private String areaname;
-
-    /**
-     * 开井时间
-     */
-    private BigDecimal openTime;
-
-    /**
-     * 昨日开井时间
-     */
-    private BigDecimal lastOpenTime;
-
-    /**
-     * 干压
-     */
-    private BigDecimal trunkPressure;
-
-    /**
-     * 油压
-     */
-    private BigDecimal oilPressure;
-
-    /**
-     * 套压
-     */
-    private BigDecimal casingPressure;
-
-    /**
-     * 日配注量
-     */
-    private BigDecimal planDailyWater;
-
-    /**
-     * 日注水量
-     */
-    private BigDecimal dailyWater;
-
-    /**
-     * 油压变化
-     */
-    private BigDecimal oilPressureDiff;
-
-    /**
-     * 水量变化
-     */
-    private BigDecimal waterDiff;
-
-    /**
-     * 水量变化率
-     */
-    private BigDecimal waterDiffRate;
-
-    /**
-     * 异常类型，压力/水量
-     */
-    private String typeId;
-
-    /**
-     * 异常原因ID，字典ABNORMAL_REASON
-     */
-    private String reasonId;
-    private String reasonName;
-
-    /**
-     * 关井原因
-     */
-    private String closeReason;
-
-    /**
-     * 创建时间
-     */
-    private Date createdOn;
-
-    /**
-     * 修改时间
-     */
-    private Date modifiedOn;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/entity/AbnormalWellReason.java

@@ -1,59 +0,0 @@
-package cn.com.victorysoft.business.condition.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * @author 
- * 异常井原因分析
- */
-@Data
-public class AbnormalWellReason implements Serializable {
-    /**
-     * 井号
-     */
-    private String wellname;
-
-    /**
-     * 年月
-     */
-    private String month;
-
-    /**
-     * 单位代码
-     */
-    private String unitcode;
-    private String unitname;
-
-    private String fullname;
-
-
-    /**
-     * 单元名称
-     */
-    private String blockname;
-
-    /**
-     * 管理区
-     */
-    private String areaname;
-
-    /**
-     * 异常原因ID，字典ABNORMAL_REASON
-     */
-    private String reasonId;
-    private String reasonName;
-
-    /**
-     * 创建时间
-     */
-    private Date createdOn;
-
-    /**
-     * 修改时间
-     */
-    private Date modifiedOn;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/entity/AdjustPlan.java

@@ -1,152 +0,0 @@
-package cn.com.victorysoft.business.condition.entity;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * @author 
- * 分注井测调计划安排
- */
-@Data
-public class AdjustPlan implements Serializable {
-
-    /**
-     * 井号
-     */
-    private String wellname;
-
-    /**
-     * 年月
-     */
-    private String month;
-
-    /**
-     * 单位代码
-     */
-    private String unitcode;
-
-    private String unitname;
-
-    private String fullname;
-
-    /**
-     * 单元名称
-     */
-    private String blockname;
-
-    /**
-     * 管理区
-     */
-    private String areaname;
-
-    /**
-     * 作业日期
-     */
-    private Date workDate;
-
-    /**
-     * 管柱类型ID
-     */
-    private String tubeTypeId;
-    private String tubeTypeName;
-
-    /**
-     * 配水器（型号）
-     */
-    private String waterDispenser;
-
-    /**
-     * 注水时间
-     */
-    private BigDecimal injectTime;
-
-    /**
-     * 上次测试-测调单位
-     */
-    private String lastUnit;
-
-    /**
-     * 上次测试-测调日期
-     */
-    private Date lastDate;
-
-    /**
-     * 分层配注1
-     */
-    private BigDecimal planWater1;
-
-    /**
-     * 分层配注2
-     */
-    private BigDecimal planWater2;
-
-    /**
-     * 分层配注3
-     */
-    private BigDecimal planWater3;
-
-    /**
-     * 分层配注4
-     */
-    private BigDecimal planWater4;
-
-    /**
-     * 分层配注5
-     */
-    private BigDecimal planWater5;
-
-    /**
-     * 分层配注6
-     */
-    private BigDecimal planWater6;
-
-    /**
-     * 分层配注7
-     */
-    private BigDecimal planWater7;
-
-    /**
-     * 测调目的
-     */
-    private String purposeId;
-    private String purposeName;
-
-    /**
-     * 完工日期
-     */
-    private Date finishDate;
-
-    /**
-     * 未完成原因
-     */
-    private String unfinishReason;
-
-    /**
-     * 不成功原因
-     */
-    private String failureReason;
-
-    /**
-     * 配注
-     */
-    private String dispensingNote;
-
-    /**
-     * 实注
-     */
-    private String solidInjection;
-
-    /**
-     * 创建时间
-     */
-    private Date createdOn;
-
-    /**
-     * 修改时间
-     */
-    private Date modifiedOn;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/entity/AdjustRecord.java

@@ -1,72 +0,0 @@
-package cn.com.victorysoft.business.condition.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * @author 
- * 分注井测调过程
- */
-@Data
-public class AdjustRecord implements Serializable {
-    /**
-     * 井号
-     */
-    private String wellname;
-
-    /**
-     * 日期
-     */
-    private Date recordDate;
-
-    /**
-     * 单位代码
-     */
-    private String unitcode;
-    private String unitname;
-
-    /**
-     * 单元名称
-     */
-    private String blockname;
-
-    /**
-     * 管理区
-     */
-    private String areaname;
-
-    /**
-     * 测调单位
-     */
-    private String unit;
-
-    /**
-     * 完工日期
-     */
-    private Date finishDate;
-
-    /**
-     * 管柱类型ID
-     */
-    private String tubeTypeId;
-    private String tubeTypeName;
-
-    /**
-     * 未完成原因ID
-     */
-    private String failureReasonId;
-    private String failureReasonName;
-
-    /**
-     * 创建时间
-     */
-    private Date createdOn;
-
-    /**
-     * 修改时间
-     */
-    private Date modifiedOn;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/entity/ConditionUnit.java

@@ -1,66 +0,0 @@
-package cn.com.victorysoft.business.condition.entity;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * @author 
- * 注水井工况单位日度数据
- */
-@Data
-public class ConditionUnit implements Serializable {
-    /**
-     * 单位代码
-     */
-    private String unitcode;
-    private String unitname;
-
-    /**
-     * 日期
-     */
-    private Date recordDate;
-
-    /**
-     * 合计
-     */
-    private Integer totalWell;
-
-    /**
-     * 正常井
-     */
-    private Integer normalWell;
-    private BigDecimal normalRate;
-
-    /**
-     * 欠注井
-     */
-    private Integer lessWell;
-    private BigDecimal lessRate;
-
-    /**
-     * 超注井
-     */
-    private Integer moreWell;
-    private BigDecimal moreRate;
-
-    /**
-     * 不清井
-     */
-    private Integer unclearWell;
-    private BigDecimal unclearRate;
-
-    /**
-     * 异常井
-     */
-    private Integer abnormalWell;
-    private BigDecimal abnormalRate;
-
-    /**
-     * 统计时间
-     */
-    private Date summaryDate;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/entity/ConditionWell.java

@@ -1,89 +0,0 @@
-package cn.com.victorysoft.business.condition.entity;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * @author 
- * 注水井工况
- */
-@Data
-public class ConditionWell implements Serializable {
-    /**
-     * 井号
-     */
-    private String wellname;
-
-    /**
-     * 日期
-     */
-    private Date recordDate;
-
-    /**
-     * 单位代码
-     */
-    private String unitcode;
-    private String unitname;
-
-    private String fullname;
-
-    /**
-     * 单元名称
-     */
-    private String blockname;
-
-    /**
-     * 管理区
-     */
-    private String areaname;
-
-    /**
-     * 层位
-     */
-    private String layer;
-
-    /**
-     * 干压
-     */
-    private BigDecimal trunkPressure;
-
-    /**
-     * 油压
-     */
-    private BigDecimal oilPressure;
-
-    /**
-     * 套压
-     */
-    private BigDecimal casingPressure;
-
-    /**
-     * 日配注量
-     */
-    private BigDecimal planDailyWater;
-
-    /**
-     * 日注水量
-     */
-    private BigDecimal dailyWater;
-
-    /**
-     * 工况类型ID，字典CONDITION_TYPE
-     */
-    private String typeId;
-    private String typeName;
-
-    /**
-     * 创建时间
-     */
-    private Date createdOn;
-
-    /**
-     * 修改时间
-     */
-    private Date modifiedOn;
-
-    private static final long serialVersionUID = 1L;
-}

vseaf4.4-condition/src/main/java/cn/com/victorysoft/business/condition/entity/FlushDaily.java

@@ -1,140 +0,0 @@
-package cn.com.victorysoft.business.condition.entity;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author 
- * 洗井日报
- */
-@Data
-public class FlushDaily implements Serializable {
-    /**
-     * 井号
-     */
-    private String wellname;
-
-    /**
-     * 日期
-     */
-    private Date recordDate;
-
-    /**
-     * 单位代码
-     */
-    private String unitcode;
-    private String unitname;
-
-    /**
-     * 全称
-     */
-    private String fullname;
-
-    /**
-     * 洗井时长
-     */
-    private BigDecimal rangeTime;
-
-    /**
-     * 洗井排量
-     */
-    private BigDecimal displacement;
-
-    /**
-     * 洗井原因
-     */
-    private String reason;
-
-    /**
-     * 洗井方式ID，字典FLUSH_TYPE
-     */
-    private String typeId;
-    private String typeName;
-
-    /**
-     * 洗井前油压
-     */
-    private BigDecimal beforePt;
-
-    /**
-     * 洗井前配注
-     */
-    private BigDecimal beforePlanWater;
-
-    /**
-     * 洗井前实注
-     */
-    private BigDecimal beforeWater;
-
-    /**
-     * 洗井后油压
-     */
-    private BigDecimal afterPt;
-
-    /**
-     * 洗井后配注
-     */
-    private BigDecimal afterPlanWater;
-
-    /**
-     * 洗井后实注
-     */
-    private BigDecimal afterWater;
-
-    /**
-     * 洗井后实注/配注
-     */
-    private BigDecimal afterWaterRate;
-
-    /**
-     * 对比油压
-     */
-    private BigDecimal comparePt;
-
-    /**
-     * 对比配注
-     */
-    private BigDecimal comparePlanWater;
-
-    /**
-     * 对比实注
-     */
-    private BigDecimal compareWater;
-
-    /**
-     * 洗井有效
-     */
-    private String effective;
-    private String effectiveName;
-
-    /**
-     * 创建时间
-     */
-    private Date createdOn;
-
-    /**
-     * 修改时间
-     */
-    private Date modifiedOn;
-
-    /**
-     * 排序
-     */
-    private BigDecimal num;
-
-    /**
-     * 年月
-     */
-    private String ny;
-
-    /**
-     * 备注
-     */
-    private String bz;
-
-    private static final long serialVersionUID = 1L;
-}