|
|
@ -15,8 +15,10 @@ import com.ruoyi.common.utils.Query; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.*; |
|
|
|
import java.util.HashMap; |
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* Service业务层处理 |
|
|
|
* Service业务层处理 |
|
|
@ -111,11 +113,6 @@ public class WaterPhotoInfoServiceImpl extends ServiceImpl<WaterPhotoInfoMapper, |
|
|
|
} |
|
|
|
} |
|
|
|
return ""; |
|
|
|
return ""; |
|
|
|
} |
|
|
|
} |
|
|
|
public String formatDate(Long d){ |
|
|
|
|
|
|
|
Date date = new Date(d); |
|
|
|
|
|
|
|
SimpleDateFormat sm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
|
|
|
|
|
|
|
return sm.format(date); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
public ChartData getChartOptionData(Map<String, Object> params){ |
|
|
|
public ChartData getChartOptionData(Map<String, Object> params){ |
|
|
|
ChartData data = null; |
|
|
|
ChartData data = null; |
|
|
|
List<YcData> dataList = baseMapper.selectWaterData(params); |
|
|
|
List<YcData> dataList = baseMapper.selectWaterData(params); |
|
|
|