From b157e41411b77abcbb0e9d3d59fabc1d951b47ad Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:36:05 +0800
Subject: [PATCH] fix：立行立改增加经纬度
---
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java | 13 +++
screen-api/src/main/java/com/moral/api/utils/WcharTest.java | 91 ++++++++++++++++++++++
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java | 11 ++
screen-api/src/main/java/com/moral/api/task/jobTask.java | 39 +++++++++
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java | 11 ++
screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java | 6 +
screen-api/src/main/java/com/moral/api/entity/Allocation.java | 10 ++
screen-api/src/main/resources/application-qa.yml | 4
screen-api/src/main/java/com/moral/ScreenApiBootstrap.java | 8 +
screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java | 12 +++
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java | 11 ++
screen-api/src/main/resources/mapper/AllocationMapper.xml | 8 +
12 files changed, 219 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/ScreenApiBootstrap.java b/screen-api/src/main/java/com/moral/ScreenApiBootstrap.java
index 26351cd..de445b6 100644
--- a/screen-api/src/main/java/com/moral/ScreenApiBootstrap.java
+++ b/screen-api/src/main/java/com/moral/ScreenApiBootstrap.java
@@ -4,6 +4,7 @@
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
@@ -19,7 +20,12 @@
@EnableTransactionManagement
public class ScreenApiBootstrap {
public static void main(String[] args) {
- ApplicationContext applicationContext = SpringApplication.run(ScreenApiBootstrap.class, args);
+ /*SpringApplicationBuilder builder = new SpringApplicationBuilder(ScreenApiBootstrap.class);
+ builder.headless(false)
+ // .web(WebApplicationType.NONE)
+ // .bannerMode(Banner.Mode.OFF)
+ .run(args);*/
+ ApplicationContext applicationContext = SpringApplication.run(ScreenApiBootstrap.class, args);
SpringContextUtils.setApplicationContext(applicationContext);
}
@Bean
diff --git a/screen-api/src/main/java/com/moral/api/entity/Allocation.java b/screen-api/src/main/java/com/moral/api/entity/Allocation.java
index 73e8bc5..b803c16 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Allocation.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Allocation.java
@@ -141,4 +141,14 @@
private Integer keyPoint;
+ private String latitude;
+ private String longitude;
+ /**
+ * ���������������
+ */
+ private String address;
+ /**
+ * ������������
+ */
+ private String name;
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java
index f7f27d1..aeffd1a 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java
@@ -37,6 +37,19 @@
@ApiModelProperty(value = "������������")
private String pollutePosition;
+ @ApiModelProperty(value = "������")
+ private String latitude;
+
+ @ApiModelProperty(value = "������")
+ private String longitude;
+
+ @ApiModelProperty(value = "���������������")
+ private String address;
+
+ @ApiModelProperty(value = "������������")
+ private String name;
+
+
@ApiModelProperty(value = "������������id")
private Integer unitId;
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java
index e1ad1f5..8ea2fdb 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationUpdateCond.java
@@ -49,6 +49,17 @@
@NotNull(message = "���������������������������")
private Integer polluteType;
+ @ApiModelProperty(value = "������")
+ private String latitude;
+
+ @ApiModelProperty(value = "������")
+ private String longitude;
+
+ @ApiModelProperty(value = "���������������")
+ private String address;
+
+ @ApiModelProperty(value = "������������")
+ private String name;
@ApiModelProperty(value = "������������id")
@NotNull(message = "���������������������������")
private Integer changeType;
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
index 0b507d1..962c35d 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
@@ -41,6 +41,17 @@
@ApiModelProperty(value = "������������")
private String pollutePosition;
+ @ApiModelProperty(value = "������")
+ private String latitude;
+
+ @ApiModelProperty(value = "������")
+ private String longitude;
+
+ @ApiModelProperty(value = "���������������")
+ private String address;
+
+ @ApiModelProperty(value = "������������")
+ private String name;
@ApiModelProperty(value = "������������")
private Integer changeDay;
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
index 556d88e..1f0a8a8 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
@@ -150,6 +150,17 @@
@TableField(exist = false)
private String polluteTypeName;
+ @ApiModelProperty(value = "������")
+ private String latitude;
+
+ @ApiModelProperty(value = "������")
+ private String longitude;
+
+ @ApiModelProperty(value = "���������������")
+ private String address;
+
+ @ApiModelProperty(value = "������������")
+ private String name;
public static AllocationVo convert(AllocationExt allocationExt) {
AllocationVo allocationVo = BeanConverts.convert(allocationExt, AllocationVo.class);
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
index 00c0cbb..503c633 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/app/AppAllocationFindVo.java
@@ -77,6 +77,18 @@
//������������������
private String escalationUnitName;
+ @ApiModelProperty(value = "������")
+ private String latitude;
+
+ @ApiModelProperty(value = "������")
+ private String longitude;
+
+ @ApiModelProperty(value = "���������������")
+ private String address;
+
+ @ApiModelProperty(value = "������������")
+ private String name;
+
public Integer getResidueDay() {
int day=0;
if (this.changeType==ChangeEnum.DEADLINE.value){
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java
index 61cb019..99cc3d0 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationExtensionServiceImpl.java
@@ -107,4 +107,10 @@
}
return true;
}
+
+
+
+
}
+
+
diff --git a/screen-api/src/main/java/com/moral/api/task/jobTask.java b/screen-api/src/main/java/com/moral/api/task/jobTask.java
new file mode 100644
index 0000000..6e5df4f
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/task/jobTask.java
@@ -0,0 +1,39 @@
+/*
+package com.moral.api.task;
+
+import com.moral.api.utils.WcharTest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.awt.*;
+import java.util.Date;
+
+*/
+/**
+ * @ClassName jobTask
+ * @Description TODO
+ * @Author @cjl
+ * @Date 2023-12-07 15:08
+ * @Version 1.0
+ *//*
+
+@Component
+@EnableScheduling
+@Slf4j
+public class jobTask {
+ @Scheduled(cron = "0/20 * * * * ?")
+ public void startTask(){
+ String friendNickName = "������������������";// "������������������";
+ String msg="���������������������������������������������������";
+ try {
+ WcharTest.sendMsgforSp(friendNickName,msg);
+ } catch (Exception e) {
+ log.error("error result ",e);
+ throw new RuntimeException(e);
+ }
+ System.out.println("������20������������������" + new Date());
+ }
+}
+*/
diff --git a/screen-api/src/main/java/com/moral/api/utils/WcharTest.java b/screen-api/src/main/java/com/moral/api/utils/WcharTest.java
new file mode 100644
index 0000000..04a57b6
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/utils/WcharTest.java
@@ -0,0 +1,91 @@
+package com.moral.api.utils;
+
+import lombok.SneakyThrows;
+
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.event.KeyEvent;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * @ClassName WcharTest
+ * @Description TODO
+ * @Author @cjl
+ * @Date 2023-12-07 14:27
+ * @Version 1.0
+ */
+public class WcharTest {
+ public static void main(String[] args) throws ParseException {
+ // ������������
+ String friendNickName = "������������������";// "������������������";
+ String msg="������������������00";//������������
+ Timer timer = new Timer();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = format.parse("2023-07-03 14:43:00");
+ System.out.println("���������������");
+ timer.schedule(new TimerTask() {
+ @SneakyThrows
+ @Override
+ public void run() {
+ sendMsgforSp(friendNickName, msg);
+ }
+ },date);
+ System.out.println("������");
+ }
+
+ /**
+ * ���������������������
+ * @param friendNickName ������������
+ * @param msg ������������
+ * @throws AWTException
+ */
+ public static void sendMsgforSp(String friendNickName, String msg) throws AWTException {
+ //������robot������
+ Robot robot = new Robot();
+ //������������������������ control+alt+w
+ robot.keyPress(KeyEvent.VK_CONTROL);
+ robot.keyPress(KeyEvent.VK_ALT);
+ robot.keyPress(KeyEvent.VK_W);
+ //������Ctrl������������Ctrl������������������������������������������������������������������������������
+ robot.keyRelease(KeyEvent.VK_CONTROL);
+ robot.keyRelease(KeyEvent.VK_ALT);
+ // ���������������������������������������
+ robot.delay(2000);
+
+ //���������������������
+ // Ctrl + F ������������������
+ robot.keyPress(KeyEvent.VK_CONTROL);
+ robot.keyPress(KeyEvent.VK_F);
+ robot.keyRelease(KeyEvent.VK_CONTROL);
+ // ���������������������������������
+ Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard();
+ Transferable tText = new StringSelection(friendNickName);
+ clip.setContents(tText, null);
+ // ���������������������ctrl+v���������������������
+ robot.keyPress(KeyEvent.VK_CONTROL);
+ robot.keyPress(KeyEvent.VK_V);
+ robot.keyRelease(KeyEvent.VK_CONTROL);
+ robot.delay(2000);
+ robot.keyPress(KeyEvent.VK_ENTER);
+ robot.delay(2000);
+
+ //���������������������
+ //������������
+ // ������������������������������
+ Transferable tText1 = new StringSelection(msg);
+ clip.setContents(tText1, null);
+ // ���������������������ctrl+v���������������������
+ robot.keyPress(KeyEvent.VK_CONTROL);
+ robot.keyPress(KeyEvent.VK_V);
+ robot.keyRelease(KeyEvent.VK_CONTROL);
+ // ������������
+ robot.keyPress(KeyEvent.VK_ENTER);
+ robot.delay(2000);
+ }
+}
diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index ccec2b7..6b0351b 100644
--- a/screen-api/src/main/resources/application-qa.yml
+++ b/screen-api/src/main/resources/application-qa.yml
@@ -21,7 +21,7 @@
main:
allow-bean-definition-overriding: true
redis:
- host: r-bp1hez4g7rkqjswpay158.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpaypd159.redis.rds.aliyuncs.com
port: 6379
password: moral_123456
timeout: 30000
@@ -38,7 +38,7 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1hez4g7rkqjswpay158.redis.rds.aliyuncs.com
+ host: r-bp1hez4g7rkqjswpaypd159.redis.rds.aliyuncs.com
port: 6379
password: moral_123456
timeout: 30000
diff --git a/screen-api/src/main/resources/mapper/AllocationMapper.xml b/screen-api/src/main/resources/mapper/AllocationMapper.xml
index a51cb05..61f2f99 100644
--- a/screen-api/src/main/resources/mapper/AllocationMapper.xml
+++ b/screen-api/src/main/resources/mapper/AllocationMapper.xml
@@ -28,16 +28,20 @@
<result column="state" property="state" />
<result column="invalid_reason" property="invalidReason" />
<result column="key_point" property="keyPoint" />
+ <result column="latitude" property="latitude" />
+ <result column="longitude" property="longitude" />
+ <result column="address" property="address" />
+ <result column="name" property="name" />
</resultMap>
<!-- ��������������������� -->
<sql id="Base_Column_List">
- allocation_id, allocation_num, escalation_type, escalation_time, pollute_position, unit_id, pollute_type, change_type, change_day, escalation_unit_id, escalation_name, investigation_type, problem_describe, is_change, change_describe, change_name, change_time, check_score, check_describe, check_name, check_time, state, is_del, is_invalid, invalid_reason, create_id, create_name, create_time, update_id, update_name, update_time
+ allocation_id, allocation_num, escalation_type, escalation_time, pollute_position, unit_id, pollute_type, change_type, change_day, escalation_unit_id, escalation_name, investigation_type, problem_describe, is_change, change_describe, change_name, change_time, check_score, check_describe, check_name, check_time, state, is_del, is_invalid, invalid_reason, create_id, create_name, create_time, update_id, update_name, update_time,latitude,longitude,address,name
</sql>
<!-- ��������������������� -->
<sql id="Allocation_Column_List">
- allocation.allocation_id, allocation.allocation_num, allocation.escalation_type, allocation.escalation_time, allocation.pollute_position, allocation.unit_id, allocation.pollute_type, allocation.change_type, allocation.change_day, allocation.escalation_unit_id, allocation.escalation_name, allocation.investigation_type, allocation.problem_describe, allocation.is_change, allocation.change_describe, allocation.change_name, allocation.change_time, allocation.check_score, allocation.check_describe, allocation.check_name, allocation.check_time, allocation.state, allocation.is_del, allocation.is_invalid, allocation.invalid_reason, allocation.create_id, allocation.create_name, allocation.create_time, allocation.update_id, allocation.update_name, allocation.update_time,allocation.key_point
+ allocation.allocation_id, allocation.allocation_num, allocation.escalation_type, allocation.escalation_time, allocation.pollute_position, allocation.unit_id, allocation.pollute_type, allocation.change_type, allocation.change_day, allocation.escalation_unit_id, allocation.escalation_name, allocation.investigation_type, allocation.problem_describe, allocation.is_change, allocation.change_describe, allocation.change_name, allocation.change_time, allocation.check_score, allocation.check_describe, allocation.check_name, allocation.check_time, allocation.state, allocation.is_del, allocation.is_invalid, allocation.invalid_reason, allocation.create_id, allocation.create_name, allocation.create_time, allocation.update_id, allocation.update_name, allocation.update_time,allocation.key_point,allocation.latitude,allocation.longitude,allocation.address,allocation.name
</sql>
--
Gitblit v1.8.0