From 0fdd42e318f51f9e3c6581473416af1cca69877f Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期四, 16 五月 2024 15:44:13 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectWorkServiceImpl.java | 429 -----------------------------------------------------
1 files changed, 0 insertions(+), 429 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectWorkServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectWorkServiceImpl.java
index a3da4d3..bbd61af 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectWorkServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectWorkServiceImpl.java
@@ -2,7 +2,6 @@
import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.exception.BusinessException;
-import com.javaweb.common.json.JSON;
import com.javaweb.common.utils.NumberUtils;
import com.javaweb.common.utils.StringUtils;
import com.javaweb.geo.domain.*;
@@ -10,9 +9,6 @@
import com.javaweb.geo.service.IProjectWorkService;
import com.javaweb.geo.vo.ProjectWorkVo;
import com.javaweb.geo.vo.YanTuVo;
-import com.javaweb.geotdp.domain.ResponseResult;
-import com.javaweb.geotdp.enums.RecordType;
-import com.javaweb.platform.domain.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,431 +21,6 @@
@Autowired
private ProjectMapper projectMapper;
- @Autowired
- private HoleMapper holeMapper;
-
- @Autowired
- private HoleHuiciMapper holeHuiciMapper;
-
- @Autowired
- private HoleYantuMapper holeYantuMapper;
-
- @Autowired
- private HoleQutuMapper holeQutuMapper;
-
- @Autowired
- private HoleBiaoguanMapper holeBiaoguanMapper;
-
- @Autowired
- private HoleShuiweiMapper holeShuiweiMapper;
-
- @Autowired
- private HolePersonMapper holePersonMapper;
-
- @Autowired
- private HoleMediaMapper holeMediaMapper;
-
-
- /**
- * 宸ヤ綔閲忕粺璁�
- */
- @Override
- public AjaxResult workloadAccount(String projectId) {
- ProjectWorkVo projectWorkVo;
- try {
- projectWorkVo = getProjectWork(projectId);
- } catch (Exception e) {
- e.printStackTrace();
- return AjaxResult.error("鑾峰彇宸ヤ綔閲忕粺璁″け璐�");
- }
- return AjaxResult.success("鑾峰彇宸ヤ綔閲忕粺璁℃垚鍔�", projectWorkVo);
- }
-
- /**
- * 鑾峰彇閽诲瓟鏁版嵁
- * @param holeId
- * @return
- */
- @Override
- public AjaxResult holeRecordList(String holeId){
-
- AjaxResult ajaxResult = AjaxResult.success("鑾峰彇閽诲瓟鏁版嵁鎴愬姛");
- try{
-
- Hole hole = holeMapper.selectHoleById(holeId);
- ajaxResult.put("hole",hole);
-
- HoleYantu holeYantu = new HoleYantu();
- holeYantu.setHoleId(holeId);
- holeYantu.setIsDelete(false);
- holeYantuMapper.selectHoleYantuList(holeYantu);
- List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuList(holeYantu);
-
- ajaxResult.put("yantuList",yantus);
-
- }catch (Exception e){
- e.printStackTrace();
- return AjaxResult.error("鍙栭捇瀛旀暟鎹け璐�");
- }
-
- return ajaxResult;
- }
-
- /**
- * 鍦拌川閽诲瓟鏌辩姸鍥�
- * @param holeId
- * @return
- */
- @Override
- public List<Map<Object, Object>> histogramJson(String holeId) {
- List<Map<Object,Object>> mapList=new ArrayList<>();
- //====================宀╁湡==================
- HoleYantu holeYantu = new HoleYantu();
- holeYantu.setHoleId(holeId);
- holeYantu.setIsDelete(false);
-
- List<HoleYantu> holeYantuList =holeYantuMapper.selectHoleYantuList(holeYantu);
-
- holeYantuList= holeYantuList.stream().filter(v->v.getBeginDepth() !=null && v.getEndDepth() !=null).collect(Collectors.toList());
- holeYantuList = holeYantuList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(HoleYantu:: getEndDepth))), ArrayList::new));
-
- try {
- holeYantuList.sort((x, y) -> Double.compare(x.getEndDepth(), y.getEndDepth()));
- }
- catch(Exception e) {
- throw new BusinessException("宀╁湡鏁版嵁鎺掑簭寮傚父:"+e.toString());
- }
- for(HoleYantu yantu:holeYantuList) {
- Map<Object,Object> map=new HashMap<Object,Object>();
- map.put("id", yantu.getIds());
- map.put("type", "宀╁湡");
- map.put("code", yantu.getCode());
- map.put("typeName", yantu.getFrequencyType());
- map.put("layerName", yantu.getLayerName());
- map.put("begin", yantu.getBeginDepth());
- map.put("end", yantu.getEndDepth());
- map.put("medias",new String[0]);
-
- String title="";
-
- if(!StringUtils.isEmpty(yantu.getFrequencyType())){
- title+="宀╁湡绫诲瀷锛�"+yantu.getFrequencyType()+";";
- }
-
- if(!StringUtils.isEmpty(yantu.getLayerName())){
- title+="宀╁湡瀹氬悕锛�"+yantu.getLayerName()+";";
- }
-
- if(!StringUtils.isEmpty(yantu.getYs())) {
- title+="棰滆壊锛�"+yantu.getYs()+";";
- }
- if(!StringUtils.isEmpty(yantu.getMsd())) {
- title+="瀵嗗疄搴︼細"+yantu.getMsd()+";";
- }
- if(!StringUtils.isEmpty(yantu.getSd())) {
- title+="婀垮害锛�"+yantu.getSd()+";";
- }
-
- if(!StringUtils.isEmpty(yantu.getYbljx())) {
- title+="涓�鑸矑寰勫皬锛�"+yantu.getYbljx()+";";
- }
- if(!StringUtils.isEmpty(yantu.getYbljd())) {
- title+="涓�鑸矑寰勫ぇ锛�"+yantu.getYbljd()+";";
- }
- if(!StringUtils.isEmpty(yantu.getZdlj())) {
- title+="鏈�澶х矑寰勶細"+yantu.getZdlj()+";";
- }
- if(!StringUtils.isEmpty(yantu.getZt())) {
- title+="鐘舵�侊細"+yantu.getZt()+";";
- }
- if(!StringUtils.isEmpty(yantu.getBhw())) {
- title+="鍖呭惈鐗╋細"+yantu.getBhw()+";";
- }
- if(!StringUtils.isEmpty(yantu.getKlxz())) {
- title+="棰楃矑褰㈢姸锛�"+yantu.getKlxz()+";";
- }
- if(!StringUtils.isEmpty(yantu.getKlpl())) {
- title+="棰楃矑鎺掑垪锛�"+yantu.getKlpl()+";";
- }
- if(!StringUtils.isEmpty(yantu.getKljp())) {
- title+="棰楃矑绾ч厤锛�"+yantu.getKljp()+";";
- }
- map.put("title", title);
- mapList.add(map);
- }
- //=========================姘翠綅==================================
- HoleShuiwei holeShuiwei = new HoleShuiwei();
- holeShuiwei.setHoleId(holeId);
- holeShuiwei.setIsDelete(false);
-
- List<HoleShuiwei> shuiweiList = holeShuiweiMapper.selectHoleShuiweiList(holeShuiwei);
-
- shuiweiList=shuiweiList.stream().filter(v->v.getShownWaterLevel()!=null&&v.getStillWaterLevel()!=null).collect(Collectors.toList());
- try {
- shuiweiList.sort((x, y) -> Double.compare(x.getShownWaterLevel(),y.getShownWaterLevel()));
- }
- catch(Exception e) {
- throw new BusinessException("姘翠綅鏁版嵁鎺掑簭寮傚父:"+e.toString());
- }
- for(HoleShuiwei shuiwei:shuiweiList) {
- Map<Object,Object> map=new HashMap<Object,Object>();
- map.put("id", shuiwei.getIds());
- map.put("type", "姘翠綅");
- map.put("code", shuiwei.getCode());
- map.put("typeName", "鍦颁笅姘�");
- map.put("begin", shuiwei.getShownTime());
- map.put("end", shuiwei.getStillWaterLevel());
- map.put("medias",new String[0]);
- String title="";
- if(shuiwei.getShownWaterLevel() !=null){
- title+="鍒濊姘翠綅锛�"+shuiwei.getShownWaterLevel()+";";
- }
- if(shuiwei.getStillWaterLevel() !=null){
- title+="绋冲畾姘翠綅锛�"+shuiwei.getStillWaterLevel()+";";
- }
- map.put("title", title);
- mapList.add(map);
- }
- try {
- mapList.sort((x, y) -> Double.compare(Double.parseDouble(x.get("begin").toString()),Double.parseDouble(y.get("begin").toString())));
- }
- catch(Exception e) {
- System.out.print(e);
- }
- //==========================鍥炴==========================
- HoleHuici holeHuici = new HoleHuici();
- holeHuici.setHoleId(holeId);
- holeHuici.setIsDelete(false);
- List<HoleHuici> huiciList = holeHuiciMapper.selectHoleHuiciList(holeHuici);
-
- huiciList=huiciList.stream().filter(v->v.getBeginDepth()!=null&&v.getEndDepth()!=null).collect(Collectors.toList());
- try {
- huiciList.sort((x, y) -> Double.compare(x.getEndDepth(),y.getEndDepth()));
- }
- catch(Exception e) {
- System.out.print(e);
- }
- for(HoleHuici huici:huiciList) {
- Map<Object,Object> map=new HashMap<Object,Object>();
- map.put("id", huici.getIds());
- map.put("type", "鍥炴");
- map.put("code", huici.getCode());
- map.put("typeName", huici.getFrequencyType()+'-'+huici.getFrequencyMode());
- map.put("begin", huici.getBeginDepth());
- map.put("end", huici.getEndDepth());
- map.put("medias",new String[0]);
- String title="";
- if(!StringUtils.isEmpty(huici.getFrequencyType())) {
- title+="閽昏繘鏂规硶锛�"+huici.getFrequencyType()+";";
- }
- if(!StringUtils.isEmpty(huici.getFrequencyMode())) {
- title+="鎶ゅ鏂规硶锛�"+huici.getFrequencyMode()+";";
- }
- if(huici.getAperture() !=null ) {
- title+="閽诲瓟瀛斿緞锛�"+huici.getAperture()+";";
- }
- if(huici.getBeginDepth() != null ) {
- title+="璧峰娣卞害锛�"+huici.getBeginDepth()+";";
- }
- if(huici.getEndDepth() !=null) {
- title+="缁堟娣卞害锛�"+huici.getEndDepth()+";";
- }
- map.put("title", title);
- mapList.add(map);
- }
-
- //=======================鍙栨牱 / 鍙栧湡==========================
-
- HoleQutu holeQutu = new HoleQutu();
- holeQutu.setHoleId(holeId);
- holeQutu.setIsDelete(false);
-
- List<HoleQutu> qutuList = holeQutuMapper.selectHoleQutuList(holeQutu);
-
- qutuList=qutuList.stream().filter(v->v.getBeginDepth()!=null&&v.getEndDepth()!=null).collect(Collectors.toList());
- try {
- qutuList.sort((x, y) -> Double.compare(x.getEndDepth(),y.getEndDepth()));
- }
- catch(Exception e) {
- System.out.print(e);
- }
- for(HoleQutu qutu:qutuList) {
- Map<Object,Object> map=new HashMap<Object,Object>();
- map.put("id", qutu.getIds());
- map.put("type", "鍙栧湡");
- map.put("code",qutu.getCode());
- map.put("typeName", "鍙栧湡");
- map.put("begin", qutu.getBeginDepth());
- map.put("end", qutu.getEndDepth());
- map.put("medias",new String[0]);
- String title="";
- if(!StringUtils.isEmpty(qutu.getEarthType())) {
- title+="鍦熸牱璐ㄩ噺绛夌骇锛�"+qutu.getEarthType()+";";
- }
- if(!StringUtils.isEmpty(qutu.getGetMode())) {
- title+="鍙栨牱宸ュ叿鍜屾柟娉曪細"+qutu.getGetMode()+";";
- }
- map.put("title", title);
- mapList.add(map);
- }
-
- //==================鍔ㄦ帰/鏍囪疮===========================
- HoleBiaoguan holeBiaoguan = new HoleBiaoguan();
- holeBiaoguan.setHoleId(holeId);
- holeBiaoguan.setIsDelete(false);
-
- List<HoleBiaoguan> biaoguanList = holeBiaoguanMapper.selectHoleBiaoguanList(holeBiaoguan);
- try {
- biaoguanList.sort((x, y) -> Double.compare(x.getBegin1(),y.getBegin1()));
- }
- catch(Exception e) {
- System.out.print(e);
- }
- for(HoleBiaoguan biaogaun:biaoguanList) {
- if(biaogaun.getBegin1() != null && biaogaun.getBegin1() !=0 ) {
- Map<Object,Object> map=new HashMap<Object,Object>();
- map.put("id", biaogaun.getIds());
- if(biaogaun.getType().equals(RecordType.dt.getId())) {
- map.put("type", "鍔ㄦ帰");
- map.put("typeName", "鍔ㄦ帰");
- }
- else if(biaogaun.getType().equals(RecordType.bg.getId())) {
- map.put("type", "鏍囪疮");
- map.put("typeName", "鏍囪疮");
- }
- map.put("code", biaogaun.getCode());
- map.put("begin", biaogaun.getBegin1());
-// Double endDepth=0.0;
- //姝ゅend 鏈夌枒闂�
- map.put("end", biaogaun.getEnd1());
- map.put("medias",new String[0]);
- String title="";
-
- if(biaogaun.getDrillLength()!=null) {
- title+="閽绘潌闀垮害锛�"+biaogaun.getDrillLength()+";";
- }
- if(biaogaun.getBegin1()!=null && biaogaun.getBlow1() !=null) {
- title+="<br/>棰勶細"+biaogaun.getBegin1()+"m~"+biaogaun.getEnd1()+"m="+biaogaun.getBlow1()+";";
- }
- if(biaogaun.getBegin2()!=null && biaogaun.getBlow2() !=null) {
- title+="<br/>1锛�"+biaogaun.getBegin2()+"m~"+biaogaun.getEnd2()+"m="+biaogaun.getBlow2()+";";
- }
- if(biaogaun.getBegin3()!=null&&biaogaun.getBlow3() !=null) {
- title+="<br/>2锛�"+biaogaun.getBegin3()+"m~"+biaogaun.getEnd3()+"m="+biaogaun.getBlow3()+";";
- }
- if(biaogaun.getBegin4()!=null&&biaogaun.getBlow4() !=null) {
- title+="<br/>3锛�"+biaogaun.getBegin4()+"m~"+biaogaun.getEnd4()+"m="+biaogaun.getBlow4()+";";
- }
- map.put("title", title);
- mapList.add(map);
- }
- }
- return mapList;
- }
-
-
- /**
- * 宸ヤ綔閲忕粺璁�
- * @param projectId
- * @return
- */
- private ProjectWorkVo getProjectWork(String projectId){
-
- // 姘翠綅 + 鍙栨按
- Long shuiWeiCount = holeShuiweiMapper.countNumberByProjectId(projectId, RecordType.sw.getName());
- Long quShuiCount = holeShuiweiMapper.countNumberByProjectId(projectId, RecordType.qs.getName());
-
- // 鏍囪疮 + 鍔ㄦ帰
- Long biaoGuanCount = holeBiaoguanMapper.countNumberByProjectId(projectId, RecordType.bg.getName());
- Long dongKanCount = holeBiaoguanMapper.countNumberByProjectId(projectId, RecordType.dt.getName());
-
- // 鐓х墖
- Long zhaoPianCount = holeMediaMapper.countNumberByProjectId(projectId);
-
- //鍙栨牱(鍥炴)
- Long huiCiCount = holeHuiciMapper.countNumberByProjectId(projectId);
-
- //TODO 鍥炴鎬昏繘灏恒�佹�绘鏁�
-
- //TODO 宀╁湡瀵硅薄
-
- ProjectWorkVo projectWorkVo = new ProjectWorkVo();
- projectWorkVo.setHuiciCount(-1d);
- projectWorkVo.setHuiciNumber(huiCiCount);
-
- projectWorkVo.setShuiWeiNumber(shuiWeiCount);
- projectWorkVo.setQuYangNumber(huiCiCount);
- projectWorkVo.setQuShuiNumber(quShuiCount);
- projectWorkVo.setDongTanNumber(dongKanCount);
- projectWorkVo.setBiaoGuanNumber(biaoGuanCount);
- projectWorkVo.setZhaoPianNumber(zhaoPianCount);
-
- //鑾峰彇宀╁湡鐨勫璞￠泦鍚�
- List<YanTuVo> yantuList = YanTuVoList(projectId);
- projectWorkVo.setYanTuList(yantuList);
-
- return projectWorkVo;
- }
-
-
- /**
- * 鑾峰彇宀╁湡宸ヤ綔閲忚〃鏍�
- * @return
- */
- private List<YanTuVo> YanTuVoList(String projectId){
- HoleYantu holeYantu = new HoleYantu();
- holeYantu.setProjectId(projectId);
- holeYantu.setIsDelete(false);
-
- //List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuList(holeYantu);
- List<HoleYantu> yantus = holeYantuMapper.selectTongjiHoleYantuList(holeYantu);
- Map <String,Integer> cishuMap= new HashMap<>();
- Map<String,Double> jinchiMap = new HashMap<>();
-
- for(HoleYantu tu : yantus){
- String ftype = tu.getFrequencyType();
- if(StringUtils.isEmpty(ftype)){
- continue;
- }
- Double begin = tu.getBeginDepth();
- Double end = tu.getEndDepth();
- if(begin==null || end ==null){
- continue;
- }
- Double total = end-begin;
- if(cishuMap.containsKey(ftype)){
- cishuMap.put(ftype,cishuMap.get(ftype)+1);
- jinchiMap.put(ftype,jinchiMap.get(ftype)+total);
- }else{
- cishuMap.put(ftype,1);
- jinchiMap.put(ftype,total);
- }
- }
- Integer CISHU = 0;
- Double JINCHI=0d;
- List<YanTuVo> list = new ArrayList<>();
- for(Map.Entry<String,Integer> entry : cishuMap.entrySet() ){
- CISHU +=entry.getValue();
- JINCHI += jinchiMap.get(entry.getKey());
-
- //璁剧疆vo瀵硅薄
- YanTuVo yanTuVo = new YanTuVo();
- yanTuVo.setFrequencyType(entry.getKey());
- yanTuVo.setCishuNumber(entry.getValue().longValue());
- yanTuVo.setJinchiCount(NumberUtils.div(jinchiMap.get(entry.getKey()),1,2));
- list.add(yanTuVo);
- }
-
- YanTuVo yan = new YanTuVo();
- yan.setFrequencyType("鎬昏");
- yan.setJinchiCount(NumberUtils.div(JINCHI,1,2));
- yan.setCishuNumber(CISHU.longValue());
-
- List<YanTuVo> result = new ArrayList<>();
- result.add(yan);
- result.addAll(list);
- return result;
- }
}
--
Gitblit v1.9.1