'提交'

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3835,6 +3835,12 @@
     SELECT distinct car_No, net_time
     from METER_WORK_CAR_ACTUAL
     where VALUE_FLAG != '0'
+    <if test="baseSpotNames != null and baseSpotNames.size() != 0">
+      and NET_SPOT3_NAME in
+      <foreach collection="baseSpotNames" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
+    </if>
     <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
       and  NET_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
@@ -3865,6 +3871,7 @@
     <if test="isPreScale != null and isPreScale != null">
       and  is_pre_scale like '%${isPreScale}%'
     </if>
+
     order by net_time desc
   </select>
 

src/main/java/com/steerinfo/meterwork/meterworkdatacount/controller/MeterWorkDataCountController.java

@@ -445,6 +445,18 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "静态轨道衡同车号当日异地计量结净净重核查报表-获取列表", notes = "分页模糊查询")
+    @PostMapping(value = "/dynamicRailwayRemoteComparison")
+    public RESTfulResult dynamicRailwayRemoteComparison(@RequestBody HashMap parmas) {
+        try {
+            PageList<StaticRailwayRemoteComparison> list = meterWorkDataCountService.dynamicRailwayRemoteComparison(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "Rfid识别率分析汇总统计-获取列表", notes = "不分页模糊查询")
     @PostMapping(value = "/rfidIdentifyAnalysisSummary")
     public RESTfulResult rfidIdentifyAnalysisSummary(@RequestBody HashMap parmas) {

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.java

@@ -39,4 +39,5 @@ public interface MeterWorkDataCountMapper {
 
     List<String> measurementAccuracyCreateManName(HashMap params);
 
+    List<StaticRailwayRemoteComparison> dynamicRailwayRemoteComparison(HashMap params);
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -1493,4 +1493,67 @@
         and A.create_man_name is not null
         order by A.create_man_name
     </select>
+    <select id="dynamicRailwayRemoteComparison"
+            resultType="com.steerinfo.meterwork.meterworkdatacount.model.StaticRailwayRemoteComparison">
+        select A.actual_no actualNo,
+        A.railway_no railwayNo,
+        A.lc_no lcNo,
+        A.prediction_no predictionNo,
+        A.matter_no matterNo,
+        A.matter_name matterName,
+        A.forwarding_unit_name forwardingUnitName,
+        A.receiving_uint_name receivingUintName,
+        to_char(round(A.gross_Weight/1000, 2),'FM9999999999999999.00') grossWeight,
+        to_char(round(A.tare_weight/1000, 2),'FM9999999999999999.00') tareWeight,
+        to_char(round(A.net_weight/1000, 2),'FM9999999999999999.00') netWeight,
+        to_char(round(to_number(B.theory_amount), 2),'FM9999999999999999.00') theoryAmount,
+        case when A.meter_type_no = 'SendToOutTms' then '外发'
+        when A.meter_type_no = 'GM2GM' then '厂内转储'
+        when A.meter_type_no = 'PO2GM' then '外进'
+        else null end meterTypeNo,
+        case when A.meter_type_Name = 'SendToOutTms' then '外发'
+        when A.meter_type_Name = 'GM2GM' then '厂内转储'
+        when A.meter_type_Name = 'PO2GM' then '外进'
+        else null end meterTypeName,
+        A.sender_remark senderRemark,
+        A.gross_time grossTime,
+        A.base_spot1_name baseSpot1Name,
+        case when A.gross_mode = '1' then '远程计量'
+        when A.gross_mode = '2' then '智能计量'
+        when A.gross_mode = '3' then '手工计量'
+        else null end grossMode,
+        A.gross_man_name grossManName,
+        A.tare_time tareTime,
+        A.base_spot2_name baseSpot2Name,
+        case when A.tare_mode = '1' then '远程计量'
+        when A.tare_mode = '2' then '智能计量'
+        when A.tare_mode = '3' then '手工计量'
+        else null end tareMode,
+        A.tare_man_name tareManName,
+        A.net_time netTime,
+        A.net_spot3_name netSpot3Name,
+        A.net_man_name netManName,
+        case when A.value_flag = '0' then '作废'
+        when A.value_flag = '1' then '有效-未发布'
+        when A.value_flag = '2' then '有效-已发布'
+        else null end valueFlag,
+        case when A.upload_flag = '1' then '未同步'
+        when A.upload_flag = '2' then '已同步'
+        else null end uploadFlag,
+        A.check_man_no checkManNo,
+        A.check_man_name checkManName,
+        A.check_time checkTime,
+        A.memo memo
+        from meter_work_railway_actual A
+        left join pre_railway_scale B on A.prediction_no = B.prediction_no
+        where A.railway_type_no in ('001019002')
+        and A.base_spot1_no != base_spot2_no
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+            and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="railwayNo != null and railwayNo != ''">
+            and A.railway_no like '%${railwayNo}%'
+        </if>
+    </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/IMeterWorkDataCountService.java

@@ -38,4 +38,6 @@ public interface IMeterWorkDataCountService{
     List<String> measurementAccuracyCreateManName(HashMap params);
 
     PageList<RailwayActualGrossWeightComparison> railwayActualNetWeightComparisonDetail(HashMap parmas);
+
+    PageList<StaticRailwayRemoteComparison> dynamicRailwayRemoteComparison(HashMap parmas);
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/impl/MeterWorkDataCountServiceImpl.java

@@ -1336,4 +1336,12 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
         return pageInfo;
     }
 
+    @Override
+    public PageList<StaticRailwayRemoteComparison> dynamicRailwayRemoteComparison(HashMap params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<StaticRailwayRemoteComparison> rows = meterWorkDataCountMapper.dynamicRailwayRemoteComparison(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/controller/MeterWorkRailwayActualBakController.java

@@ -223,6 +223,25 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value = "火车号汇总统计汇总", notes = "根据传入时间和火车号，查询给定时间段去重车号")
+    @PostMapping(value = "/distinctRailwayNo")
+    public RESTfulResult distinctRailwayNoPost(@RequestBody HashMap param) {
+        RESTfulResult rm = failed();
+        try {
+            List<String> rows = meterWorkRailwayActualBakService.distinctRailwayNo(param);
+            return success(rows);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "结净数据维护-网页", notes = "根据传入时间查询去重列次编号")
     @PostMapping(value = "/distinctLcNo")
     public RESTfulResult distinctLcNo(@RequestBody HashMap param) {

src/main/resources/application.properties

@@ -84,6 +84,11 @@ multiple.datasource.master.maxWait=1000
 multiple.datasource.master.timeBetweenEvictionRunsMillis=60000
 multiple.datasource.master.minEvictableIdleTimeMillis=300000
 
+#设置连接池自动回收
+multiple.datasource.master.remove-abandoned=true
+multiple.datasource.master.remove-abandoned-timeout=5
+multiple.datasource.master.log-abandoned=true
+
 #slave1
 multiple.datasource.slave1.driver-class-name=oracle.jdbc.driver.OracleDriver
 multiple.datasource.slave1.url=jdbc:oracle:thin:@10.1.201.50:1521/jgjldata