后端修改

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/controller/MeterWorkCarMeterTimeController.java

@@ -4,6 +4,7 @@ import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime;
 import com.steerinfo.meterwork.meterworkcarmetertime.service.IMeterWorkCarMeterTimeService;
 import io.swagger.annotations.ApiImplicitParam;
@@ -42,6 +43,21 @@ public class MeterWorkCarMeterTimeController extends BaseRESTfulController {
     IMeterWorkCarMeterTimeService meterWorkCarMeterTimeService;
 
 
+
+    @ApiOperation(value="获取称点统计时间")
+    @ApiImplicitParam(name = "meterWorkCarMeterTime", value = "详细实体meterWorkCarMeterTime", required = true, dataType = "MeterWorkCarMeterTime")
+    @PostMapping(value = "/getGroupByTime")
+    @Transactional
+    public RESTfulResult getGroupByTime(@RequestBody(required = false) HashMap meterWorkCarMeterTime){
+        try {
+            List<GroupTimeVo> groupByTime = meterWorkCarMeterTimeService.getGroupByTime(meterWorkCarMeterTime);
+            return success(groupByTime);
+        }catch (Exception e){
+            e.printStackTrace();
+            return success(null,"操作失败");
+        }
+    }
+
     @ApiOperation(value="新增汽车衡计量时间")
     @ApiImplicitParam(name = "meterWorkCarMeterTime", value = "详细实体meterWorkCarMeterTime", required = true, dataType = "MeterWorkCarMeterTime")
     @PostMapping(value = "/insert")

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.java

@@ -1,10 +1,16 @@
 package com.steerinfo.meterwork.meterworkcarmetertime.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime;
 import java.math.*;
+import java.util.HashMap;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.shiro.crypto.hash.Hash;
 
 @Mapper
 public interface MeterWorkCarMeterTimeMapper extends IBaseMapper<MeterWorkCarMeterTime, String> {
-}
+    List<GroupTimeVo> selectGroupByTime(HashMap meterWorkCarMeterTime);
+}

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.xml

@@ -17,12 +17,12 @@
     <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <sql id="columns">
-    ACTUAL_FIRST_NO, START_TIME, METER_START_TIME, METER_END_TIME, END_TIME, TOTAL_NUM, 
+    ACTUAL_FIRST_NO, START_TIME, METER_START_TIME, METER_END_TIME, END_TIME, TOTAL_NUM,
     UP_NUM, METER_NUM, DOWN_NUM, VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME
   </sql>
   <sql id="columns_alias">
-    t.ACTUAL_FIRST_NO, t.START_TIME, t.METER_START_TIME, t.METER_END_TIME, t.END_TIME, 
-    t.TOTAL_NUM, t.UP_NUM, t.METER_NUM, t.DOWN_NUM, t.VALUE_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, 
+    t.ACTUAL_FIRST_NO, t.START_TIME, t.METER_START_TIME, t.METER_END_TIME, t.END_TIME,
+    t.TOTAL_NUM, t.UP_NUM, t.METER_NUM, t.DOWN_NUM, t.VALUE_FLAG, t.CREATE_MAN_NO, t.CREATE_MAN_NAME,
     t.CREATE_TIME
   </sql>
   <sql id="select">
@@ -32,7 +32,7 @@
     SELECT <include refid="columns_alias"/> FROM METER_WORK_CAR_METER_TIME t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="actualFirstNo != null and actualFirstNo != ''">
         and ACTUAL_FIRST_NO = #{actualFirstNo}
       </if>
@@ -75,7 +75,7 @@
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="actualFirstNo != null and actualFirstNo != ''">
         and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
       </if>
@@ -123,7 +123,7 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from METER_WORK_CAR_METER_TIME
-    where 1!=1 
+    where 1!=1
       <if test="startTime != null">
         or TO_CHAR(START_TIME,'yyyy-MM-dd') = '#{startTime}'
       </if>
@@ -162,15 +162,15 @@
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime">
-    insert into METER_WORK_CAR_METER_TIME (ACTUAL_FIRST_NO, START_TIME, METER_START_TIME, 
-      METER_END_TIME, END_TIME, TOTAL_NUM, 
-      UP_NUM, METER_NUM, DOWN_NUM, 
-      VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+    insert into METER_WORK_CAR_METER_TIME (ACTUAL_FIRST_NO, START_TIME, METER_START_TIME,
+      METER_END_TIME, END_TIME, TOTAL_NUM,
+      UP_NUM, METER_NUM, DOWN_NUM,
+      VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME,
       CREATE_TIME)
-    values (#{actualFirstNo,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, #{meterStartTime,jdbcType=TIMESTAMP}, 
-      #{meterEndTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{totalNum,jdbcType=DECIMAL}, 
-      #{upNum,jdbcType=DECIMAL}, #{meterNum,jdbcType=DECIMAL}, #{downNum,jdbcType=DECIMAL}, 
-      #{valueFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
+    values (#{actualFirstNo,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, #{meterStartTime,jdbcType=TIMESTAMP},
+      #{meterEndTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{totalNum,jdbcType=DECIMAL},
+      #{upNum,jdbcType=DECIMAL}, #{meterNum,jdbcType=DECIMAL}, #{downNum,jdbcType=DECIMAL},
+      #{valueFlag,jdbcType=VARCHAR}, #{createManNo,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR},
       #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime">
@@ -329,21 +329,21 @@
     <include refid="whereLike"/>
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into METER_WORK_CAR_METER_TIME 
-      (ACTUAL_FIRST_NO, 
-      START_TIME, METER_START_TIME, 
-      METER_END_TIME, END_TIME, TOTAL_NUM, 
-      UP_NUM, METER_NUM, DOWN_NUM, 
-      VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME, 
+    insert into METER_WORK_CAR_METER_TIME
+      (ACTUAL_FIRST_NO,
+      START_TIME, METER_START_TIME,
+      METER_END_TIME, END_TIME, TOTAL_NUM,
+      UP_NUM, METER_NUM, DOWN_NUM,
+      VALUE_FLAG, CREATE_MAN_NO, CREATE_MAN_NAME,
       CREATE_TIME)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.actualFirstNo,jdbcType=VARCHAR}, 
-      #{item.startTime,jdbcType=TIMESTAMP}, #{item.meterStartTime,jdbcType=TIMESTAMP}, 
-      #{item.meterEndTime,jdbcType=TIMESTAMP}, #{item.endTime,jdbcType=TIMESTAMP}, #{item.totalNum,jdbcType=DECIMAL}, 
-      #{item.upNum,jdbcType=DECIMAL}, #{item.meterNum,jdbcType=DECIMAL}, #{item.downNum,jdbcType=DECIMAL}, 
-      #{item.valueFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR}, 
-      #{item.createTime,jdbcType=TIMESTAMP} from dual  
+    ( <foreach collection="list" item="item" separator="union all">
+   select
+      #{item.actualFirstNo,jdbcType=VARCHAR},
+      #{item.startTime,jdbcType=TIMESTAMP}, #{item.meterStartTime,jdbcType=TIMESTAMP},
+      #{item.meterEndTime,jdbcType=TIMESTAMP}, #{item.endTime,jdbcType=TIMESTAMP}, #{item.totalNum,jdbcType=DECIMAL},
+      #{item.upNum,jdbcType=DECIMAL}, #{item.meterNum,jdbcType=DECIMAL}, #{item.downNum,jdbcType=DECIMAL},
+      #{item.valueFlag,jdbcType=VARCHAR}, #{item.createManNo,jdbcType=VARCHAR}, #{item.createManName,jdbcType=VARCHAR},
+      #{item.createTime,jdbcType=TIMESTAMP} from dual
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -401,19 +401,37 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
        </foreach>
-     where ACTUAL_FIRST_NO in 
+     where ACTUAL_FIRST_NO in
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.actualFirstNo,jdbcType=VARCHAR}
-     </foreach> 
+     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from METER_WORK_CAR_METER_TIME
-    where ACTUAL_FIRST_NO in 
+    where ACTUAL_FIRST_NO in
     <foreach collection="list" item="id" open="(" close=")" separator=",">
       #{id}
     </foreach>
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
-</mapper>
+  <select id="selectGroupByTime"
+          resultType="com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo">
+    select
+    t1.BASE_SPOT_NO baseSpotNo,
+    t1.BASE_SPOT_NAME baseSpotName,
+    avg(t.TOTAL_NUM) avgTotal,
+    avg(t.UP_NUM) avgUp,
+    avg(t.METER_NUM) avgMeter,
+    avg(t.DOWN_NUM) avgDown
+    from METER_WORK_CAR_METER_TIME t
+    left join meter_work_car_actual_first t1
+    on t.actual_first_no =t1.actual_first_no
+    <where>
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+    </where>
+    group by t1.BASE_SPOT_NO,t1.BASE_SPOT_NAME
+  </select>
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/model/GroupTimeVo.java

@@ -0,0 +1,79 @@
+package com.steerinfo.meterwork.meterworkcarmetertime.model;
+
+/**
+ * @Author zhangnan
+ * @Date 2022-10-20 16:07
+ * @Version 1.0
+ */
+
+/**
+ * 统计时间返回实体
+ */
+public class GroupTimeVo {
+    String baseSpotNo;
+    String baseSpotName;
+    double avgTotal;
+    double avgUp;
+    double avgMeter;
+    double avgDown;
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo;
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName;
+    }
+
+    public double getAvgTotal() {
+        return avgTotal;
+    }
+
+    public void setAvgTotal(double avgTotal) {
+        this.avgTotal = avgTotal;
+    }
+
+    public double getAvgUp() {
+        return avgUp;
+    }
+
+    public void setAvgUp(double avgUp) {
+        this.avgUp = avgUp;
+    }
+
+    public double getAvgMeter() {
+        return avgMeter;
+    }
+
+    public void setAvgMeter(double avgMeter) {
+        this.avgMeter = avgMeter;
+    }
+
+    public double getAvgDown() {
+        return avgDown;
+    }
+
+    public void setAvgDown(double avgDown) {
+        this.avgDown = avgDown;
+    }
+
+    @Override
+    public String toString() {
+        return "GroupTimeVo{" +
+                "baseSpotNo='" + baseSpotNo + '\'' +
+                ", baseSpotName='" + baseSpotName + '\'' +
+                ", avgTotal=" + avgTotal +
+                ", avgUp=" + avgUp +
+                ", avgMeter=" + avgMeter +
+                ", avgDown=" + avgDown +
+                '}';
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/service/IMeterWorkCarMeterTimeService.java

@@ -1,9 +1,12 @@
 package com.steerinfo.meterwork.meterworkcarmetertime.service;
 
 import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterWorkCarMeterTime服务接口：
@@ -20,4 +23,5 @@ import java.math.BigDecimal;
  */
 public interface IMeterWorkCarMeterTimeService extends IBaseService<MeterWorkCarMeterTime, String>{
 
-}
+    List<GroupTimeVo> getGroupByTime(HashMap meterWorkCarMeterTime);
+}

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/service/impl/MeterWorkCarMeterTimeServiceImpl.java

@@ -2,6 +2,7 @@ package com.steerinfo.meterwork.meterworkcarmetertime.service.impl;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
 import com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime;
 import com.steerinfo.meterwork.meterworkcarmetertime.mapper.MeterWorkCarMeterTimeMapper;
 import com.steerinfo.meterwork.meterworkcarmetertime.service.IMeterWorkCarMeterTimeService;
@@ -9,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterWorkCarMeterTime服务实现：
@@ -33,4 +36,9 @@ public class MeterWorkCarMeterTimeServiceImpl extends BaseServiceImpl<MeterWorkC
     protected IBaseMapper<MeterWorkCarMeterTime, String> getMapper() {
         return meterWorkCarMeterTimeMapper;
     }
+
+    @Override
+    public List<GroupTimeVo> getGroupByTime(HashMap meterWorkCarMeterTime) {
+        return meterWorkCarMeterTimeMapper.selectGroupByTime(meterWorkCarMeterTime);
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/controller/MeterWorkOldAndNew.java

@@ -170,8 +170,19 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
             List<HashMap> totalList = Stream.of(newList, oldList)
                     .flatMap(x -> x.stream())
                     .collect(Collectors.toList());
-
             PageList pageInfo = this.helpPage(params, totalList);
+
+//            if(totalList.size() >= 1){
+//                double weightSum = totalList.stream().flatMap(item -> Double.parseDouble(item.get("METER_WEIGHT").toString())).sum();
+//            }
+//
+////            for(HashMap param: totalList){
+////                weightSum += Long.parseLong(param.get("METER_WEIGHT").toString());
+////            }
+//
+//            HashMap<String, Object> map = new HashMap<>();
+//            map.put("pageInfo", pageInfo);
+//            map.put("weightSum", weightSum);
             rm.setCode("200");
             rm.setMessage("操作成功！！");
             rm.setData(pageInfo);

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -3797,7 +3797,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                         MeterWorkRailwayReceived received = meterWorkRailwayReceivedMapper.selectByPrimaryKey(grossModel.getActualFirstNo());
                         if(received != null) {
                             HashMap<String, Object> obj = new HashMap<>();
-                            obj.put("railwayWorkNo", received.getRailwayWorkNo());
+                            obj.put("soundName", received.getRailwayWorkNo());
                             //把列次号变为未处理
                             List<MeterWorkRailwayRecMain> recMains = meterWorkRailwayRecMainMapper.selectByParameters(obj);
                             if(recMains.size() >= 1) {
@@ -3823,7 +3823,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                         MeterWorkRailwayReceived received = meterWorkRailwayReceivedMapper.selectByPrimaryKey(tareModel.getActualFirstNo());
                         if(received != null) {
                             HashMap<String, Object> obj = new HashMap<>();
-                            obj.put("railwayWorkNo", received.getRailwayWorkNo());
+                            obj.put("soundName", received.getRailwayWorkNo());
                             //把列次号变为未处理
                             List<MeterWorkRailwayRecMain> recMains = meterWorkRailwayRecMainMapper.selectByParameters(obj);
                             if(recMains.size() >= 1) {