From 571fde613c4ea3e5660a00e50d0e442006e8eb52 Mon Sep 17 00:00:00 2001 From: Angel <1050374295@qq.com> Date: Thu, 21 Dec 2023 16:23:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/JcjCjxxViewMysql.java | 10 + .../mapper/JcjCjxxViewMysqlMapper.java | 10 + .../mapper/JcjJxxViewMysqlMapper.java | 2 +- .../service/JcjCjxxViewMysqlService.java | 5 + .../impl/JcjCjxxViewMysqlServiceImpl.java | 7 + .../mysqloracletest/task/AlarmInfoTask.java | 112 ++++---- .../ssf/mysqloracletest/task/JcjCjxxTask.java | 3 - .../mapper/JcjCjxxViewMapperMysql.xml | 259 ++++++++++-------- .../mapper/JcjJjxxViewMysqlMapper.xml | 32 ++- 9 files changed, 261 insertions(+), 179 deletions(-) diff --git a/src/main/java/com/ssf/mysqloracletest/domain/JcjCjxxViewMysql.java b/src/main/java/com/ssf/mysqloracletest/domain/JcjCjxxViewMysql.java index f6b6864..9c09b51 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/JcjCjxxViewMysql.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/JcjCjxxViewMysql.java @@ -224,5 +224,15 @@ public class JcjCjxxViewMysql implements Serializable { @TableField(value = "RYWKSJ") private String RYWKSJ; + @TableField(value = "status") private String status; + + @TableField(exist = false) + private String LEFTTOPLONGITUDE; + @TableField(exist = false) + private String RIGHTBOTTOMLONGITUDE; + @TableField(exist = false) + private String RIGHTBOTTOMLATITUDE; + @TableField(exist = false) + private String LEFTTOPLATITUDE; } \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewMysqlMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewMysqlMapper.java index 8ea65a0..99d229a 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewMysqlMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/JcjCjxxViewMysqlMapper.java @@ -2,7 +2,11 @@ package com.ssf.mysqloracletest.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ssf.mysqloracletest.domain.JcjCjxxViewMysql; +import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author 28758 @@ -19,6 +23,12 @@ public interface JcjCjxxViewMysqlMapper extends BaseMapper { public int updateCjxxById(JcjCjxxViewMysql bean); JcjCjxxViewMysql selectRecordOrderByRksj(); + + @Select(" select * " + + " from jcj_jjxx_view " + + " where JDZB BETWEEN #{LEFTTOPLONGITUDE} AND #{RIGHTBOTTOMLONGITUDE} " + + " AND WDZB BETWEEN #{RIGHTBOTTOMLATITUDE} AND #{LEFTTOPLATITUDE}"+" AND STATUS IS NULL") + public List selectloaction(JcjCjxxViewMysql bean); } diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/JcjJxxViewMysqlMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/JcjJxxViewMysqlMapper.java index 8c12bbb..5dfc252 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/JcjJxxViewMysqlMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/JcjJxxViewMysqlMapper.java @@ -22,6 +22,6 @@ public interface JcjJxxViewMysqlMapper extends BaseMapper { @Select(" select * " + " from jcj_jjxx_view " + " where JDZB BETWEEN #{LEFTTOPLONGITUDE} AND #{RIGHTBOTTOMLONGITUDE} " + - " AND WDZB BETWEEN #{RIGHTBOTTOMLATITUDE} AND #{LEFTTOPLATITUDE}") + " AND WDZB BETWEEN #{RIGHTBOTTOMLATITUDE} AND #{LEFTTOPLATITUDE}"+" AND STATUS IS NULL") public List selectloaction(JcjJjxxViewMysql bean); } diff --git a/src/main/java/com/ssf/mysqloracletest/service/JcjCjxxViewMysqlService.java b/src/main/java/com/ssf/mysqloracletest/service/JcjCjxxViewMysqlService.java index d74201d..7c5ede6 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/JcjCjxxViewMysqlService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/JcjCjxxViewMysqlService.java @@ -2,6 +2,9 @@ package com.ssf.mysqloracletest.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ssf.mysqloracletest.domain.JcjCjxxViewMysql; +import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; + +import java.util.List; /** * @author 28758 @@ -16,4 +19,6 @@ public interface JcjCjxxViewMysqlService extends IService { public int updateCjxxById(JcjCjxxViewMysql tjks); public JcjCjxxViewMysql selectRecordOrderByRksj(); + + public List selectloaction(JcjCjxxViewMysql bean); } diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/JcjCjxxViewMysqlServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/JcjCjxxViewMysqlServiceImpl.java index 0189f89..c9dce21 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/JcjCjxxViewMysqlServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/JcjCjxxViewMysqlServiceImpl.java @@ -8,6 +8,8 @@ import com.ssf.mysqloracletest.service.JcjCjxxViewMysqlService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author 28758 * @description 针对表【jcj_cjxx_view】的数据库操作Service实现 @@ -40,6 +42,11 @@ public class JcjCjxxViewMysqlServiceImpl extends ServiceImpl selectloaction(JcjCjxxViewMysql bean) { + return jcjCjxxViewMysqlMapper.selectloaction(bean); + } + } diff --git a/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java index d39bbd0..4e92e80 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java @@ -48,14 +48,16 @@ public class AlarmInfoTask { } try { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.isNull("STATUS"); - Page page = new Page<>(1, 200); - List resultList = jjxxViewMysqlService.page(page, queryWrapper).getRecords(); + JcjJjxxViewMysql jjxxViewMysqlCp = new JcjJjxxViewMysql(); + jjxxViewMysqlCp.setLEFTTOPLONGITUDE("120.423914"); + jjxxViewMysqlCp.setRIGHTBOTTOMLONGITUDE("120.439581"); + jjxxViewMysqlCp.setRIGHTBOTTOMLATITUDE("33.823756"); + jjxxViewMysqlCp.setLEFTTOPLATITUDE("33.833082"); - CountDownLatch latch = new CountDownLatch(resultList.size()); + List selectloaction = jjxxViewMysqlService.selectloaction(jjxxViewMysqlCp); + CountDownLatch latch = new CountDownLatch(selectloaction.size()); ExecutorService JjxxPool = Executors.newFixedThreadPool(5); - for (JcjJjxxViewMysql bean : resultList) { + for (JcjJjxxViewMysql bean : selectloaction) { JjxxPool.submit(() -> { cleanJjxx(bean); logger.info("清洗完成"); @@ -79,60 +81,54 @@ public class AlarmInfoTask { private void cleanJjxx(JcjJjxxViewMysql bean) { JcjJjxxViewMysql jjxxViewMysqlCp = new JcjJjxxViewMysql(); - jjxxViewMysqlCp.setLEFTTOPLONGITUDE("120.423914"); - jjxxViewMysqlCp.setRIGHTBOTTOMLONGITUDE("120.439581"); - jjxxViewMysqlCp.setRIGHTBOTTOMLATITUDE("33.823756"); - jjxxViewMysqlCp.setLEFTTOPLATITUDE("33.833082"); - List selectloaction = jjxxViewMysqlService.selectloaction(jjxxViewMysqlCp); - System.out.println(); + BeanUtils.copyProperties(bean, jjxxViewMysqlCp); try { -// BeanUtils.copyProperties(bean, selectloaction); -// JcjJjxxViewMysql jwd = jjxxViewMysqlService.selectJcjJxxByJJBH(selectloaction.getJJBH()); -// MetaAlarmInfo alarmInfo = new MetaAlarmInfo(); -// //设置目标字段的值 -// //alarm_code<-----JJBH 接警编号 -// alarmInfo.setAlarmCode(selectloaction.getJJBH()); -// //police_receiver_name<-----JJRXM接警人姓名 -// alarmInfo.setPoliceReceiverName(selectloaction.getJJRXM()); -// //alarm_response_time<-----JJRQSJ接警日期时间 -// alarmInfo.setAlarmResponseTime(selectloaction.getJJRQSJ()); -// //alarm_response_content<-----BJNR接警报警内容 -// alarmInfo.setAlarmResponseContent(selectloaction.getBJNR()); -// //informant_name<-----BJR接警报警人 -// alarmInfo.setInformantName(selectloaction.getBJR()); -// //informant_time<-----BJDHSJ接警报警时间 -// alarmInfo.setInformantTime(selectloaction.getBJDHSJ()); -// //informant_phone<-----LXDH接警报警人联系电话 -// alarmInfo.setInformantPhone(selectloaction.getLXDH()); -// //alarm_response_type<-----BJLXMC报警类型名称 -// alarmInfo.setAlarmResponseTypeName(selectloaction.getBJLXMC()); -// //alarm_address<-----SFDD接警事发地址 -// alarmInfo.setAlarmAddress(selectloaction.getSFDD()); -// //alarm_response_unit<-----JJDWMC接警单位名称 -// alarmInfo.setAlarmResponseUnit(selectloaction.getJJDWMC()); -// -// if (jwd.getGIS_Y() != null) { -// //latitude(纬度)<-----WDZB纬度坐标 -// alarmInfo.setLatitude(NumKit.checkBigDecimal(jwd.getGIS_Y())); -// } -// -// if (jwd.getGIS_X() != null) { -// //longitude(经度)<-----JDZB经度坐标 -// alarmInfo.setLongitude(NumKit.checkBigDecimal(jwd.getGIS_X())); -// } -// -// boolean b = alarmInfoService.save(alarmInfo); -// -// if (b) { -// selectloaction.setSTATUS("1"); -// jjxxViewMysqlService.updateJjxxByJJBH(selectloaction); -// logger.info("状态修改为：1"); -// } + JcjJjxxViewMysql jwd = jjxxViewMysqlService.selectJcjJxxByJJBH(jjxxViewMysqlCp.getJJBH()); + MetaAlarmInfo alarmInfo = new MetaAlarmInfo(); + //设置目标字段的值 + //alarm_code<-----JJBH 接警编号 + alarmInfo.setAlarmCode(jjxxViewMysqlCp.getJJBH()); + //police_receiver_name<-----JJRXM接警人姓名 + alarmInfo.setPoliceReceiverName(jjxxViewMysqlCp.getJJRXM()); + //alarm_response_time<-----JJRQSJ接警日期时间 + alarmInfo.setAlarmResponseTime(jjxxViewMysqlCp.getJJRQSJ()); + //alarm_response_content<-----BJNR接警报警内容 + alarmInfo.setAlarmResponseContent(jjxxViewMysqlCp.getBJNR()); + //informant_name<-----BJR接警报警人 + alarmInfo.setInformantName(jjxxViewMysqlCp.getBJR()); + //informant_time<-----BJDHSJ接警报警时间 + alarmInfo.setInformantTime(jjxxViewMysqlCp.getBJDHSJ()); + //informant_phone<-----LXDH接警报警人联系电话 + alarmInfo.setInformantPhone(jjxxViewMysqlCp.getLXDH()); + //alarm_response_type<-----BJLXMC报警类型名称 + alarmInfo.setAlarmResponseTypeName(jjxxViewMysqlCp.getBJLXMC()); + //alarm_address<-----SFDD接警事发地址 + alarmInfo.setAlarmAddress(jjxxViewMysqlCp.getSFDD()); + //alarm_response_unit<-----JJDWMC接警单位名称 + alarmInfo.setAlarmResponseUnit(jjxxViewMysqlCp.getJJDWMC()); + + if (jwd.getGIS_Y() != null) { + //latitude(纬度)<-----WDZB纬度坐标 + alarmInfo.setLatitude(NumKit.checkBigDecimal(jwd.getGIS_Y())); + } + + if (jwd.getGIS_X() != null) { + //longitude(经度)<-----JDZB经度坐标 + alarmInfo.setLongitude(NumKit.checkBigDecimal(jwd.getGIS_X())); + } + + boolean b = alarmInfoService.save(alarmInfo); + + if (b) { + jjxxViewMysqlCp.setSTATUS("1"); + jjxxViewMysqlService.updateJjxxByJJBH(jjxxViewMysqlCp); + logger.info("状态修改为：1"); + } } catch (Exception e) { -// logger.info(StringKit.getTrace(e)); -// selectloaction.setSTATUS("2"); -// jjxxViewMysqlService.updateJjxxByJJBH(selectloaction); -// logger.info("状态修改为：2"); + logger.info(StringKit.getTrace(e)); + jjxxViewMysqlCp.setSTATUS("2"); + jjxxViewMysqlService.updateJjxxByJJBH(jjxxViewMysqlCp); + logger.info("状态修改为：2"); } } } diff --git a/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java b/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java index 2fcbaed..2259cb9 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java @@ -181,10 +181,7 @@ public class JcjCjxxTask { cjxxMysqlService.updateCjxxById(sBean); logger.info("cjxx-" + cjxx.getJJBH() + ":更新成功"); } - } - - } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/resources/mapper/JcjCjxxViewMapperMysql.xml b/src/main/resources/mapper/JcjCjxxViewMapperMysql.xml index 2577a54..c07a46f 100644 --- a/src/main/resources/mapper/JcjCjxxViewMapperMysql.xml +++ b/src/main/resources/mapper/JcjCjxxViewMapperMysql.xml @@ -5,117 +5,123 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WS_YXX, JQSXMC, RYWKSJ, + LEFTTOPLONGITUDE , + RIGHTBOTTOMLONGITUDE , + + RIGHTBOTTOMLATITUDE , + LEFTTOPLATITUDE , + #{CJBH}, @@ -332,6 +344,14 @@ #{WS_YXX}, #{JQSXMC}, #{RYWKSJ}, + #{LEFTTOPLONGITUDE }, + + #{RIGHTBOTTOMLONGITUDE }, + + #{RIGHTBOTTOMLONGITUDE }, + + #{LEFTTOPLATITUDE }, + @@ -443,14 +463,37 @@ JQSXMC=#{JQSXMC}, RYWKSJ=#{RYWKSJ}, status=#{status}, + LEFTTOPLONGITUDE + =#{LEFTTOPLONGITUDE }, + + RIGHTBOTTOMLONGITUDE + =#{RIGHTBOTTOMLONGITUDE }, + + RIGHTBOTTOMLATITUDE + =#{RIGHTBOTTOMLONGITUDE }, + + LEFTTOPLATITUDE + =#{LEFTTOPLATITUDE }, + + where JJBH = #{JJBH} + diff --git a/src/main/resources/mapper/JcjJjxxViewMysqlMapper.xml b/src/main/resources/mapper/JcjJjxxViewMysqlMapper.xml index 868ad49..f7bc99b 100644 --- a/src/main/resources/mapper/JcjJjxxViewMysqlMapper.xml +++ b/src/main/resources/mapper/JcjJjxxViewMysqlMapper.xml @@ -281,7 +281,8 @@ WDZB , STATUS , LEFTTOPLONGITUDE , - RIGHTBOTTOMLONGITUDE , + RIGHTBOTTOMLONGITUDE , + RIGHTBOTTOMLATITUDE , LEFTTOPLATITUDE , @@ -416,8 +417,11 @@ #{WDZB }, #{STATUS }, #{LEFTTOPLONGITUDE }, - #{RIGHTBOTTOMLONGITUDE }, - #{RIGHTBOTTOMLONGITUDE }, + + #{RIGHTBOTTOMLONGITUDE }, + + #{RIGHTBOTTOMLONGITUDE }, + #{LEFTTOPLATITUDE }, @@ -556,10 +560,18 @@ JDZB =#{JDZB }, WDZB =#{WDZB }, STATUS =#{STATUS }, - LEFTTOPLONGITUDE =#{LEFTTOPLONGITUDE }, - RIGHTBOTTOMLONGITUDE =#{RIGHTBOTTOMLONGITUDE }, - RIGHTBOTTOMLATITUDE =#{RIGHTBOTTOMLONGITUDE }, - LEFTTOPLATITUDE =#{LEFTTOPLATITUDE }, + LEFTTOPLONGITUDE + =#{LEFTTOPLONGITUDE }, + + RIGHTBOTTOMLONGITUDE + =#{RIGHTBOTTOMLONGITUDE }, + + RIGHTBOTTOMLATITUDE + =#{RIGHTBOTTOMLONGITUDE }, + + LEFTTOPLATITUDE + =#{LEFTTOPLATITUDE }, + where JJBH = #{JJBH} @@ -579,11 +591,13 @@ limit 1 - select * from jcj_jjxx_view where JDZB BETWEEN #{LEFTTOPLONGITUDE} AND #{RIGHTBOTTOMLONGITUDE} - AND WDZB BETWEEN #{RIGHTBOTTOMLATITUDE} AND #{LEFTTOPLATITUDE} + AND WDZB BETWEEN #{RIGHTBOTTOMLATITUDE} AND #{LEFTTOPLATITUDE} + AND STATUS IS NULL