后端提交

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -134,16 +134,12 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value = "获取列表", notes = "分页模糊查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
-    })
+    @ApiOperation(value = "获取列表", notes = "不分页模糊查询")
     //@RequiresPermissions("meterworkcaractualfirst:view")
     @PostMapping(value = "/likeByDesc")
-    public RESTfulResult likeByDesc(@RequestBody HashMap parmas, Integer pageNum, Integer pageSize) {
+    public RESTfulResult likeByDesc(@RequestBody HashMap parmas) {
         try {
-            PageList<MeterWorkCarActualFirst> list = meterWorkCarActualFirstService.likeByDesc(parmas, pageNum, pageSize);
+            List<MeterWorkCarActualFirst> list = meterWorkCarActualFirstService.likeByValueFlag(parmas);
             return success(list);
         } catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java

@@ -135,6 +135,7 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
     RESTfulResult doNetEmergency(MeterWorkCarActual meterWorkCarActual)  throws Exception;
 
     PageList<MeterWorkCarActualFirst> likeByDesc(Map<String, Object> var1, Integer pageNum, Integer pageSize);
+    List<MeterWorkCarActualFirst> likeByValueFlag(Map<String, Object> var1);
     PageList<MeterWorkCarActualFirst> ApplikeByDesc(Map<String, Object> var1, Integer pageNum, Integer pageSize);
 
 

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -5023,6 +5023,16 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         return pageInfo;
     }
 
+    @Override
+    public List<MeterWorkCarActualFirst> likeByValueFlag(Map<String, Object> params) {
+        if(params.get("baseSpotNoStr") != null) {
+            String[] spotNoStr = params.get("baseSpotNoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
+        List<MeterWorkCarActualFirst> rows = meterWorkCarActualFirstMapper.likeByDesc(params);
+        return rows;
+    }
+
     @Override
     public PageList<MeterWorkCarActualFirst> ApplikeByDesc(Map<String, Object> params, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);

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

@@ -0,0 +1,30 @@
+package com.steerinfo.meterwork.meterworkdatacount.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.meterwork.meterworkdatacount.service.IMeterWorkDataCountService;
+import com.steerinfo.meterwork.meterworkdatacount.service.impl.MeterWorkDataCountServiceImpl;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+
+@RestController
+@RequestMapping("/${api.version}/meterworkdatacounts")
+public class MeterWorkDataCountController extends BaseRESTfulController {
+
+    @Autowired
+    MeterWorkDataCountServiceImpl meterWorkDataCountService;
+
+    @ApiOperation(value="统计汽车衡、静态衡、动态衡、铁水衡、吊钩秤的有效一次、未洁净一次、有效净重、未匹配委托净重数据", notes="返回List<HashMap>对象")
+    @PostMapping(value = "/countFirstAndActual")
+    public RESTfulResult countFirstAndActual(@RequestBody HashMap params) {
+        List<HashMap> models = meterWorkDataCountService.countFirstAndActual(params);
+        return success(models);
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.steerinfo.meterwork.meterworkdatacount.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Mapper
+public interface MeterWorkDataCountMapper {
+    List<HashMap> countFirstAndActual(HashMap<String, Object> param);
+}

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

@@ -0,0 +1,45 @@
+<?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="com.steerinfo.meterwork.meterworkdatacount.mapper.MeterWorkDataCountMapper">
+    <select id="countFirstAndActual" parameterType="java.util.HashMap" resultType="hashmap">
+        select
+        (select count(*) from meter_work_car_actual_first t where t.value_flag !='0') as count_First_Valid,
+        (select count(*) from meter_work_car_actual_first t where t.value_flag ='1') as count_First_Effective_Unclean,
+        (select count(*) from meter_work_car_actual t where t.value_flag != '0') as count_Actual_Valid,
+        (select count(*) from meter_work_car_actual t where t.value_flag != '0' and is_pre_scale = '0') as count_Actual_Effective_Unclean,
+        '汽车衡' as remark
+         from dual
+        union
+        select
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019001') and t.value_flag !='0') as count_First_Valid,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019001') and t.value_flag ='1') as count_First_Effective_Unclean,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019001') and t.value_flag != '0') as count_Actual_Valid,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019001') and t.value_flag != '0' and is_pre_sacale = '0') as count_Actual_Effective_Unclean,
+        '静态衡' as remark
+         from dual
+        union
+        select
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019002') and t.value_flag !='0') as count_First_Valid,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019002') and t.value_flag ='1') as count_First_Effective_Unclean,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019002') and t.value_flag != '0') as count_Actual_Valid,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019002') and t.value_flag != '0' and is_pre_sacale = '0') as count_Actual_Effective_Unclean,
+        '动态衡' as remark
+         from dual
+        union
+         select
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019003', '001019004') and t.value_flag !='0') as count_First_Valid,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019003', '001019004') and t.value_flag ='1') as count_First_Effective_Unclean,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019003', '001019004') and t.value_flag != '0') as count_Actual_Valid,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019003', '001019004') and t.value_flag != '0' and is_pre_sacale = '0') as count_Actual_Effective_Unclean,
+        '铁水衡' as remark
+         from dual
+        union
+        select
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019005') and t.value_flag !='0') as count_First_Valid,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019005') and t.value_flag ='1') as count_First_Effective_Unclean,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019005') and t.value_flag != '0') as count_Actual_Valid,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019005') and t.value_flag != '0' and is_pre_sacale = '0') as count_Actual_Effective_Unclean,
+        '吊钩秤' as remark
+         from dual
+    </select>
+</mapper>

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

@@ -0,0 +1,8 @@
+package com.steerinfo.meterwork.meterworkdatacount.service;
+
+import java.util.HashMap;
+import java.util.List;
+
+public interface IMeterWorkDataCountService{
+    List<HashMap> countFirstAndActual(HashMap<String, Object> params);
+}

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

@@ -0,0 +1,22 @@
+package com.steerinfo.meterwork.meterworkdatacount.service.impl;
+
+import com.steerinfo.meterwork.meterworkdatacount.mapper.MeterWorkDataCountMapper;
+import com.steerinfo.meterwork.meterworkdatacount.service.IMeterWorkDataCountService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+
+@Service
+public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService {
+
+    @Resource
+    private MeterWorkDataCountMapper meterWorkDataCountMapper;
+
+    @Override
+    public List<HashMap> countFirstAndActual(HashMap<String, Object> params) {
+        List<HashMap> models = meterWorkDataCountMapper.countFirstAndActual(params);
+        return models;
+    }
+}