Merge branch 'master' of http://192.168.2.241:3000/lishun/wt_pipeHT

DataCheck/src/main/java/com/tofly/dataCheck/custom/contoller/CustomCheckExportController.java

@@ -570,14 +570,14 @@ public class CustomCheckExportController {
                     handleAndCheckExport.setSectionDataOneJc(d.getCheckData().getSectionDataOne());
                     handleAndCheckExport.setSectionDataTwoJc(d.getCheckData().getSectionDataTwo());
                     handleAndCheckExport.setPipeLengthJc(d.getCheckData().getPipeLength());
-                    handleAndCheckExport.setVideoTimeJc(d.getCheckData().getStartCode());
-                    handleAndCheckExport.setVideoSectionDataOneJc(d.getCheckData().getEndCode());
-                    handleAndCheckExport.setVideoSectionDataTwoJc(d.getCheckData().getSectionDataOne());
-                    handleAndCheckExport.setPdCheckLengthJc(d.getCheckData().getSectionDataTwo());
-                    handleAndCheckExport.setNoHandleLengthJc(d.getCheckData().getPipeLength());
-                    handleAndCheckExport.setPdRemarkJc(d.getCheckData().getRemark());
-                    handleAndCheckExport.setIsCheckJc(d.getCheckData().getSectionDataTwo());
-                    handleAndCheckExport.setRainTaskJc(d.getCheckData().getPipeLength());
+                    handleAndCheckExport.setVideoTimeJc(d.getCheckData().getVideoTime());
+                    handleAndCheckExport.setVideoSectionDataOneJc(d.getCheckData().getVideoSectionDataOne());
+                    handleAndCheckExport.setVideoSectionDataTwoJc(d.getCheckData().getVideoSectionDataTwo());
+                    handleAndCheckExport.setPdCheckLengthJc(d.getCheckData().getPdCheckLength());
+                    handleAndCheckExport.setNoHandleLengthJc(d.getCheckData().getNoHandleLength());
+                    handleAndCheckExport.setPdRemarkJc(d.getCheckData().getPdRemark());
+                    handleAndCheckExport.setIsCheckJc(d.getCheckData().getIsCheck());
+                    handleAndCheckExport.setRainTaskJc(d.getCheckData().getRainTask());
                     handleAndCheckExport.setRemarkJc(d.getCheckData().getRemark());
                 }else{
                     checkDataExport.setArea(d.getHandleData().getArea());

DataCheck/src/main/java/com/tofly/dataCheck/entity/CheckData.java

@@ -150,4 +150,9 @@ public class CheckData extends Model<CheckData> {
     @TableLogic(value = "0", delval = "1")
     private Integer delFlag;
 
+    /**
+     * 关联项目信息表
+     */
+    @ApiModelProperty(value = "关联项目信息表")
+    private Long prjId;
 }

DataCheck/src/main/java/com/tofly/dataCheck/entity/DetectData.java

@@ -124,4 +124,10 @@ public class DetectData extends Model<DetectData> {
     @TableField(updateStrategy= FieldStrategy.IGNORED)
     private String showRemark;
 
+    /**
+     * 关联项目信息表
+     */
+    @ApiModelProperty(value = "关联项目信息表")
+    private Long prjId;
+
 }

DataCheck/src/main/java/com/tofly/dataCheck/entity/HandleData.java

@@ -183,4 +183,10 @@ public class HandleData extends Model<HandleData> {
      */
     @ApiModelProperty(value = "0:新增 1删除")
     private Integer sign;
+
+    /**
+     * 关联项目信息表
+     */
+    @ApiModelProperty(value = "关联项目信息表")
+    private Long prjId;
 }

DataCheck/src/main/java/com/tofly/dataCheck/entity/Monitorsettle.java

@@ -56,12 +56,12 @@ public class Monitorsettle extends Model<Monitorsettle> {
      * 管段长度
      */
     @ApiModelProperty(value = "管段长度")
-    private Double pipeLength;
+    private String pipeLength;
     /**
      * 管径
      */
     @ApiModelProperty(value = "管径 ")
-    private Double pipeDiaMeter;
+    private String pipeDiaMeter;
     /**
      * CCTV QV
      */
@@ -76,7 +76,7 @@ public class Monitorsettle extends Model<Monitorsettle> {
      * 视频个数
      */
     @ApiModelProperty(value = "视频个数")
-    private Integer videoNum;
+    private String videoNum;
     /**
      * 视频接收时间
      */
@@ -90,8 +90,8 @@ public class Monitorsettle extends Model<Monitorsettle> {
     /**
      * 监测长度
      */
-    @ApiModelProperty(value = "监测长度")
-    private Double checkLength;
+    @ApiModelProperty(value = "检测长度")
+    private String checkLength;
     @ApiModelProperty(value = "0正常 1删除")
     @TableLogic(value = "0", delval = "1")
     private Short delFlag;
@@ -112,4 +112,10 @@ public class Monitorsettle extends Model<Monitorsettle> {
     @ApiModelProperty(value = "备注")
     @TableField(updateStrategy= FieldStrategy.IGNORED)
     private String remark;
+
+    /**
+     * 关联项目信息表
+     */
+    @ApiModelProperty(value = "关联项目信息表")
+    private Long prjId;
 }

DataCheck/src/main/java/com/tofly/dataCheck/entity/Presettle.java

@@ -170,4 +170,9 @@ public class Presettle extends Model<Presettle> {
     @TableField(updateStrategy= FieldStrategy.IGNORED)
     private String remark;
 
+    /**
+     * 关联项目信息表
+     */
+    @ApiModelProperty(value = "关联项目信息表")
+    private Long prjId;
 }

DataCheck/src/main/java/com/tofly/dataCheck/entity/TaskData.java

@@ -114,4 +114,11 @@ public class TaskData extends Model<TaskData> {
     @TableLogic(value = "0", delval = "1")
     private Integer delFlag;
 
+    /**
+     * 关联项目信息表
+     */
+    @ApiModelProperty(value = "关联项目信息表")
+    private Long prjId;
+
+
 }

DataCheck/src/main/java/com/tofly/dataCheck/excel/listener/CheckDataListener.java

@@ -114,6 +114,13 @@ public class CheckDataListener extends AnalysisEventListener<CheckDataExcel> imp
             checkData.setInfoId(batchInfo.getId());
             BeanUtil.copyProperties(data, checkData, true);
             checkData.setStatus(ImportStatusEnum.YWC.getCode());
+            if(StringUtil.isNotEmpty(checkData.getStartCode()) && StringUtil.isNotEmpty(checkData.getEndCode())){
+                if(checkData.getStartCode().compareTo(checkData.getEndCode())>0){
+                    checkData.setStartCode(checkData.getEndCode());
+                    checkData.setEndCode(checkData.getStartCode());
+                }
+            }
+            checkData.setPrjId(batchInfo.getPrjId());
 //        log.info("解析到一条数据:{}", JSON.toJSONString(taskData));
             cachedDataList.add(checkData);
             // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM

DataCheck/src/main/java/com/tofly/dataCheck/excel/listener/DetectDataListener.java

@@ -85,6 +85,13 @@ public class DetectDataListener extends AnalysisEventListener<DetectDataExcel> i
             detectData.setInfoId(batchInfo.getId());
             BeanUtil.copyProperties(data, detectData, true);
             detectData.setStatus(ImportStatusEnum.YWC.getCode());
+            if(StringUtil.isNotEmpty(detectData.getStartCode()) && StringUtil.isNotEmpty(detectData.getEndCode())){
+                if(detectData.getStartCode().compareTo(detectData.getEndCode())>0){
+                    detectData.setStartCode(detectData.getEndCode());
+                    detectData.setEndCode(detectData.getStartCode());
+                }
+            }
+            detectData.setPrjId(batchInfo.getPrjId());
 //        log.info("解析到一条数据:{}", JSON.toJSONString(taskData));
             cachedDataList.add(detectData);
             // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM

DataCheck/src/main/java/com/tofly/dataCheck/excel/listener/HandleDataListener.java

@@ -113,6 +113,13 @@ public class HandleDataListener extends AnalysisEventListener<HandleDataExcel> i
             handleData.setInfoId(batchInfo.getId());
             BeanUtil.copyProperties(data, handleData, true);
             handleData.setStatus(ImportStatusEnum.YWC.getCode());
+            if(StringUtil.isNotEmpty(handleData.getStartCode()) && StringUtil.isNotEmpty(handleData.getEndCode())){
+                if(handleData.getStartCode().compareTo(handleData.getEndCode())>0){
+                    handleData.setStartCode(handleData.getEndCode());
+                    handleData.setEndCode(handleData.getStartCode());
+                }
+            }
+            handleData.setPrjId(batchInfo.getPrjId());
 //        log.info("解析到一条数据:{}", JSON.toJSONString(taskData));
             cachedDataList.add(handleData);
             // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM

DataCheck/src/main/java/com/tofly/dataCheck/excel/listener/MonitorSettleListener.java

@@ -138,13 +138,21 @@ public class MonitorSettleListener extends AnalysisEventListener<ExcelMonitorSet
 
         final String startToendCode = excelMonitorSettle.getStartToendCode();
         final String[] noArr = startToendCode.split(splitNo);
-        monitorsettle.setStartCode(noArr[0]);
-        monitorsettle.setEndCode(noArr[1]);
+        if(noArr!=null && noArr.length>1){
+            if(noArr[0].compareTo(noArr[1])< 0){
+                monitorsettle.setStartCode(noArr[0]);
+                monitorsettle.setEndCode(noArr[1]);
+            }else{
+                monitorsettle.setStartCode(noArr[1]);
+                monitorsettle.setEndCode(noArr[0]);
+            }
+        }
         monitorsettle.setInfoId(batchinfo.getId());
-        monitorsettle.setPipeLength(Double.parseDouble(excelMonitorSettle.getPipeLength()));
-        monitorsettle.setPipeDiaMeter(Double.parseDouble(excelMonitorSettle.getPipeDiaMeter()));
-        monitorsettle.setVideoNum(Integer.parseInt(excelMonitorSettle.getVideoNum()));
-        monitorsettle.setCheckLength(Double.parseDouble(excelMonitorSettle.getCheckLength()));
+        monitorsettle.setPipeLength(excelMonitorSettle.getPipeLength());
+        monitorsettle.setPipeDiaMeter(excelMonitorSettle.getPipeDiaMeter());
+        monitorsettle.setVideoNum(excelMonitorSettle.getVideoNum());
+        monitorsettle.setCheckLength(excelMonitorSettle.getCheckLength());
+        monitorsettle.setPrjId(batchinfo.getPrjId());
     }
 
     @Override

DataCheck/src/main/java/com/tofly/dataCheck/excel/listener/PreSettleRainListener.java

@@ -222,11 +222,19 @@ public class PreSettleRainListener implements ReadListener<ExcelPreSettle>  ,Val
         //管段编号处理
         final String startToendCode = excelPreSettle.getStartToendCode();
         final String[] noArr = startToendCode.split(splitNo);
-        presettle.setStartCode(noArr[0]);
-        presettle.setEndCode(noArr[1]);
+        if(noArr!=null && noArr.length>1){
+            if(noArr[0].compareTo(noArr[1])< 0){
+                presettle.setStartCode(noArr[0]);
+                presettle.setEndCode(noArr[1]);
+            }else{
+                presettle.setStartCode(noArr[1]);
+                presettle.setEndCode(noArr[0]);
+            }
+        }
         presettle.setCollectTime(excelPreSettle.getCollectTime());
         presettle.setNotes(excelPreSettle.getNotes());
         presettle.setInfoId(batchinfo.getId());
+        presettle.setPrjId(batchinfo.getPrjId());
     }
 
     /**

DataCheck/src/main/java/com/tofly/dataCheck/excel/listener/PreSettleSewageListener.java

@@ -182,16 +182,22 @@ public class PreSettleSewageListener implements ReadListener<ExcelPreSettle>  ,V
     }
 
     private void fillDataByExcelData(Presettle presettle, ExcelPreSettle excelPreSettle) {
-
-
         //管段编号处理
         final String startToendCode = excelPreSettle.getStartToendCode();
         final String[] noArr = startToendCode.split(splitNo);
-        presettle.setStartCode(noArr[0]);
-        presettle.setEndCode(noArr[1]);
+        if(noArr!=null && noArr.length>1){
+            if(noArr[0].compareTo(noArr[1])< 0){
+                presettle.setStartCode(noArr[0]);
+                presettle.setEndCode(noArr[1]);
+            }else{
+                presettle.setStartCode(noArr[1]);
+                presettle.setEndCode(noArr[0]);
+            }
+        }
         presettle.setInfoId(batchinfo.getId());
         presettle.setCollectTime(excelPreSettle.getCollectTime());
         presettle.setNotes(excelPreSettle.getNotes());
+        presettle.setPrjId(batchinfo.getPrjId());
 
     }
 

DataCheck/src/main/java/com/tofly/dataCheck/excel/listener/TaskDataListener.java

@@ -79,6 +79,13 @@ public class TaskDataListener extends AnalysisEventListener<TaskDataExcel> imple
             taskData.setInfoId(batchInfo.getId());
             BeanUtil.copyProperties(data, taskData, true);
             taskData.setStatus(ImportStatusEnum.YWC.getCode());
+            if(StringUtil.isNotEmpty(taskData.getStartCode()) && StringUtil.isNotEmpty(taskData.getEndCode())){
+                if(taskData.getStartCode().compareTo(taskData.getEndCode())>0){
+                    taskData.setStartCode(taskData.getEndCode());
+                    taskData.setEndCode(taskData.getStartCode());
+                }
+            }
+            taskData.setPrjId(batchInfo.getPrjId());
 //        log.info("解析到一条数据:{}", JSON.toJSONString(taskData));
             cachedDataList.add(taskData);
             // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM

DataCheck/src/main/resources/mapper/CheckDataMapper.xml

@@ -26,6 +26,7 @@
         <result property="status" column="status"/>
         <result property="checkFlag" column="check_flag"/>
         <result property="delFlag" column="del_flag"/>
+        <result property="prjId" column="prj_id"/>
         <association property="batchinfo" column="info_id"
                      select="com.tofly.dataCheck.mapper.BatchinfoMapper.selectById"></association>
     </resultMap>
@@ -51,7 +52,8 @@
         `is_check`,
         `rain_task`,
         `remark`,
-        `status`
+        `status`,
+        `prj_id`
         )
         VALUES
         <foreach collection="datas" item="data" index="index" separator=",">
@@ -75,7 +77,8 @@
             #{data.isCheck,jdbcType=VARCHAR},
             #{data.rainTask,jdbcType=VARCHAR},
             #{data.remark,jdbcType=VARCHAR},
-            #{data.status,jdbcType=INTEGER}
+            #{data.status,jdbcType=INTEGER},
+            #{data.prjId,jdbcType=BIGINT}
             )
         </foreach>
     </insert>

DataCheck/src/main/resources/mapper/DetectDataMapper.xml

@@ -21,6 +21,7 @@
         <result property="delFlag" column="del_flag"/>
         <result property="sign" column="sign"/>
         <result property="showRemark" column="show_remark"/>
+        <result property="prjId" column="prj_id"/>
         <association property="batchinfo" column="info_id"
                      select="com.tofly.dataCheck.mapper.BatchinfoMapper.selectById"></association>
     </resultMap>
@@ -75,7 +76,9 @@
         `section_data_two`,
         `is_order`,
         `remark`,
-        `status` )
+        `status`,
+        `prj_id`
+         )
         VALUES
         <foreach collection="datas" item="data" index="index" separator=",">
            (
@@ -90,7 +93,8 @@
             #{data.sectionDataTwo,jdbcType=VARCHAR},
             #{data.isOrder,jdbcType=VARCHAR},
             #{data.remark,jdbcType=VARCHAR},
-            #{data.status,jdbcType=INTEGER}
+            #{data.status,jdbcType=INTEGER},
+            #{data.prjId,jdbcType=BIGINT}
             )
         </foreach>
     </insert>

DataCheck/src/main/resources/mapper/HandleDataMapper.xml

@@ -34,6 +34,7 @@
         <result property="checkFlag" column="check_flag"/>
         <result property="delFlag" column="del_flag"/>
         <result property="sign" column="sign"/>
+        <result property="prjId" column="prj_id"/>
         <association property="batchinfo" column="info_id"
                      select="com.tofly.dataCheck.mapper.BatchinfoMapper.selectById"></association>
     </resultMap>
@@ -65,7 +66,8 @@
         `water_level_down`,
         `water_level_remark`,
         `remark`,
-        `status`
+        `status`,
+        `prj_id`
         )
         VALUES
         <foreach collection="datas" item="data" index="index" separator=",">
@@ -95,7 +97,8 @@
             #{data.waterLevelDown,jdbcType=VARCHAR},
             #{data.waterLevelRemark,jdbcType=VARCHAR},
             #{data.remark,jdbcType=VARCHAR},
-            #{data.status,jdbcType=INTEGER}
+            #{data.status,jdbcType=INTEGER},
+            #{data.prjId,jdbcType=BIGINT}
             )
         </foreach>
     </insert>

DataCheck/src/main/resources/mapper/MonitorsettleMapper.xml

@@ -22,6 +22,7 @@
         <result property="checkFlag" column="check_flag"/>
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
+        <result property="prjId" column="prj_id"/>
         <association property="batchinfo" column="info_id"
                      select="com.tofly.dataCheck.mapper.BatchinfoMapper.selectById"></association>
     </resultMap>

DataCheck/src/main/resources/mapper/PresettleMapper.xml

@@ -26,6 +26,7 @@
         <result property="pipeLengthDown" column="pipe_length_down"/>
         <result property="checkFlag" column="check_flag"/>
         <result property="remark" column="remark"/>
+        <result property="prjId" column="prj_id"/>
         <association property="batchinfo" column="info_id"
                      select="com.tofly.dataCheck.mapper.BatchinfoMapper.selectById"></association>
     </resultMap>

DataCheck/src/main/resources/mapper/TaskDataMapper.xml

@@ -18,6 +18,7 @@
         <result property="remark" column="remark"/>
         <result property="status" column="status"/>
         <result property="delFlag" column="del_flag"/>
+        <result property="prjId" column="prj_id"/>
         <association property="batchinfo" column="info_id"
                      select="com.tofly.dataCheck.mapper.BatchinfoMapper.selectById"></association>
     </resultMap>
@@ -36,7 +37,8 @@
         `section_data_two`,
         `is_order`,
         `remark`,
-        `status` )
+        `status`,
+        `prj_id`)
         VALUES
         <foreach collection="datas" item="data" index="index" separator=",">
             (
@@ -51,7 +53,8 @@
             #{data.sectionDataTwo,jdbcType=VARCHAR},
             #{data.isOrder,jdbcType=VARCHAR},
             #{data.remark,jdbcType=VARCHAR},
-            #{data.status,jdbcType=INTEGER}
+            #{data.status,jdbcType=INTEGER},
+            #{data.prjId,jdbcType=BIGINT}
             )
         </foreach>
     </insert>