diff --git a/build/classes/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.class b/build/classes/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.class new file mode 100644 index 0000000..8d99962 Binary files /dev/null and b/build/classes/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.class differ diff --git a/build/classes/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.class b/build/classes/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.class index 1613ded..e076467 100644 Binary files a/build/classes/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.class and b/build/classes/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.class differ diff --git a/src/main/data/readme.txt b/src/main/data/readme.txt index fec30e5..07d7a72 100644 --- a/src/main/data/readme.txt +++ b/src/main/data/readme.txt @@ -5,4 +5,27 @@ geom_type字段：voyage表示航次，diving表示潜次 geom_sn：表示航次号或者潜次号 geom_value：geoserver能直接用的sql语句 geom_name:预留给geoserver回写 -geom_level:预留给geoserver回写 \ No newline at end of file +geom_level:预留给geoserver回写 + +2025-10-31更新 +更新自动增长序列 +SELECT setval('dict_data_tsy_id_seq',(SELECT max(tsy_id) FROM dict_data)); +SELECT setval('dict_equipment_tsy_id_seq',(SELECT max(tsy_id) FROM dict_equipment)); +SELECT setval('dict_funding_tsy_id_seq',(SELECT max(tsy_id) FROM dict_funding)); +SELECT setval('dict_geom_tsy_id_seq',(SELECT max(tsy_id) FROM dict_geom)); +SELECT setval('dict_platform_copy1_tsy_id_seq',(SELECT max(tsy_id) FROM dict_report)); +SELECT setval('dict_platform_tsy_id_seq',(SELECT max(tsy_id) FROM dict_platform)); +SELECT setval('dict_unit_sail_tsy_id_seq',(SELECT max(tsy_id) FROM dict_unit_sail)); +SELECT setval('dict_unit_share_tsy_id_seq',(SELECT max(tsy_id) FROM dict_unit_share)); +SELECT setval('hme_frame_dept_dept_id_seq',(SELECT max(dept_id) FROM hme_frame_dept)); +SELECT setval('hme_frame_optr_optr_id_seq',(SELECT max(optr_id) FROM hme_frame_optr)); +SELECT setval('hme_frame_role_role_id_seq',(SELECT max(role_id) FROM hme_frame_role)); +SELECT setval('sample_dataset_tsy_id_seq',(SELECT max(tsy_id) FROM sample_dataset)); +SELECT setval('sample_line_track_tsy_id_seq',(SELECT max(tsy_id) FROM sample_line_track)); +SELECT setval('sample_line_tsy_id_seq',(SELECT max(tsy_id) FROM sample_line)); +SELECT setval('sample_station_track_tsy_id_seq',(SELECT max(tsy_id) FROM sample_station_track)); +SELECT setval('sample_station_tsy_id_seq',(SELECT max(tsy_id) FROM sample_station)); +SELECT setval('voyage_log_tsy_id_seq',(SELECT max(tsy_id) FROM voyage_log)); +SELECT setval('voyage_member_tsy_id_seq',(SELECT max(tsy_id) FROM voyage_member)); +SELECT setval('voyage_navigation_tsy_id_seq',(SELECT max(tsy_id) FROM voyage_navigation)); +SELECT setval('voyage_reg_tsy_id_seq',(SELECT max(tsy_id) FROM voyage_reg)); \ No newline at end of file diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.java b/src/main/java/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.java new file mode 100644 index 0000000..5c8fd27 --- /dev/null +++ b/src/main/java/cn/tsy/cas/idsse/dsds/control/api/DSDSApiVoyageControl.java @@ -0,0 +1,42 @@ +package cn.tsy.cas.idsse.dsds.control.api; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.hme.framework.frame.control.HmeAjax; +import cn.tsy.data.cas.idsse.dsds.mapper.voyage.IVoyageRegMapper; + +@RestController +@CrossOrigin +@RequestMapping("api/voyage") +public class DSDSApiVoyageControl { + + @Autowired + private IVoyageRegMapper iVoayge; + + @RequestMapping("list.htm") + public HmeAjax list() { + String sql = "select sd.voyage_id,r.voyage_name,r.ship_name,line.dataset_id,line.dataset_name,line.conver_area,line.tsy_id sample_id,line.sample_name,r.voyage_mileage,diving_sn,voyage_days " + + "from voyage_reg r,sample_dataset sd,sample_line line where r.tsy_id=sd.voyage_id and sd.tsy_id=line.dataset_id and sample_tag_name='应急搜捞' order by line.dataset_name"; + List> array = this.iVoayge.mapBySql(sql); + Map>> mapReturn = new HashMap<>(); + List> arrayReturn = new ArrayList<>(); + for(Map map:array) { + String voyage_name = map.get("voyage_name").toString(); + if(!mapReturn.containsKey(voyage_name)) { + arrayReturn.add(map); + mapReturn.put(voyage_name, new ArrayList<>()); + } + mapReturn.get(voyage_name).add(map); + } + mapReturn.put("VoyageArray", arrayReturn); + return new HmeAjax(mapReturn); + } +} diff --git a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java index fcd0dea..4e2c955 100644 --- a/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java +++ b/src/main/java/cn/tsy/cas/idsse/dsds/service/sample/SampleLineService.java @@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import cn.hme.data.frame.model.HmeFrameOptr; +import cn.hme.framework.helper.lang.HmeGsonHelper; import cn.hme.framework.helper.lang.HmeStringHelper; import cn.hme.framework.jdbc.entity.SqlCondition; import cn.hme.industry.gnss.GnssCoordinateHelper; @@ -40,6 +41,7 @@ public class SampleLineService { line.setSample_name(dataset.getDataset_name() + "_" + seq); line.setCreate_time(LocalDateTime.now()); } + System.out.println(HmeGsonHelper.fromObject(line)); // 计算覆盖面积 if (line.getConver_width() == null) line.setConver_area(0); @@ -59,6 +61,7 @@ public class SampleLineService { } } } + if (line.getTsy_id() == null) this.mLine.insert(line); else