潘钊 / bsth_control · Commits

Commit d61af9038d074988cc76cf614d234012b7d7517f

Authored by 潘钊
1 parent f5b3a17b
build: skipped

Merge branch 'minhang' into qingpu 

# Conflicts:
#	src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
Inline Side-by-side
Showing 1 changed file with 15 additions and 27 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @d61af90
1 1 package com.bsth.service.oil.impl;
2 2  
3   -import java.sql.ResultSet;
4   -import java.sql.SQLException;
5   -import java.text.DecimalFormat;
6   -import java.text.ParseException;
7   -import java.text.SimpleDateFormat;
8   -import java.util.ArrayList;
9   -import java.util.Calendar;
10   -import java.util.Date;
11   -import java.util.HashMap;
12   -import java.util.Iterator;
13   -import java.util.List;
14   -import java.util.Map;
15   -
16   -import javax.transaction.Transactional;
17   -
18   -import org.apache.commons.lang3.StringEscapeUtils;
19   -import org.slf4j.Logger;
20   -import org.slf4j.LoggerFactory;
21   -import org.springframework.beans.factory.annotation.Autowired;
22   -import org.springframework.data.domain.Sort;
23   -import org.springframework.data.domain.Sort.Direction;
24   -import org.springframework.jdbc.core.JdbcTemplate;
25   -import org.springframework.jdbc.core.RowMapper;
26   -import org.springframework.stereotype.Service;
27   -
28 3 import com.alibaba.fastjson.JSONArray;
29 4 import com.alibaba.fastjson.JSONObject;
30 5 import com.bsth.common.ResponseCode;
31   -import com.bsth.data.BasicData;
32 6 import com.bsth.entity.Cars;
33 7 import com.bsth.entity.oil.Cyl;
34 8 import com.bsth.entity.oil.Ylb;
... ... @@ -43,7 +17,21 @@ import com.bsth.service.oil.YlbService;
43 17 import com.bsth.service.realcontrol.ScheduleRealInfoService;
44 18 import com.bsth.util.Arith;
45 19 import com.bsth.util.BatchSaveUtils;
46   -import com.github.abel533.echarts.code.Y;
  20 +import org.apache.commons.lang3.StringEscapeUtils;
  21 +import org.slf4j.Logger;
  22 +import org.slf4j.LoggerFactory;
  23 +import org.springframework.beans.factory.annotation.Autowired;
  24 +import org.springframework.jdbc.core.JdbcTemplate;
  25 +import org.springframework.jdbc.core.RowMapper;
  26 +import org.springframework.stereotype.Service;
  27 +
  28 +import javax.transaction.Transactional;
  29 +import java.sql.ResultSet;
  30 +import java.sql.SQLException;
  31 +import java.text.DecimalFormat;
  32 +import java.text.ParseException;
  33 +import java.text.SimpleDateFormat;
  34 +import java.util.*;
47 35  
48 36 @Service
49 37 public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbService{
... ...