修新增接口预警
This commit is contained in:
parent
1fa75e3d63
commit
a77b66d801
|
|
@ -23,22 +23,15 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="a38a4155-0e8c-4ddb-9f60-993f173584d3" name="Default Changelist" comment="修新增接口预警">
|
||||
<change afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/entity/TicketInfo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/logs/securityControl-proteam/error.log" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/logs/securityControl-proteam/info.log" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/securityControl-proteam.jar" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-admin/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-admin/src/main/resources/application.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/mapper/InterMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/mapper/InterMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/mapper/JjBusinessMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/mapper/JjBusinessMapper.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/DataCenterService.java" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/DataCenterService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService.java" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/DataCenterXxlJob.java" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/DataCenterXxlJob.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/utils/DataUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/utils/DataUtils.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/JJBusinessXxlJob.java" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/JJBusinessXxlJob.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/application.properties" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/mapper/InterMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/mapper/InterMapper.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/logs/securityControl-proteam/error.log" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/logs/securityControl-proteam/info.log" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/mapper/JjBusinessMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/resources/mapper/JjBusinessMapper.xml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
|
|
@ -82,44 +75,44 @@
|
|||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"Application.DataCenterXxlJob.executor": "Run",
|
||||
"Application.DataUtils.executor": "Run",
|
||||
"Application.GenEntity.executor": "Run",
|
||||
"Maven.xxl-job [clean].executor": "Run",
|
||||
"Maven.xxl-job [install].executor": "Run",
|
||||
"RequestMappingsPanelOrder0": "0",
|
||||
"RequestMappingsPanelOrder1": "1",
|
||||
"RequestMappingsPanelWidth0": "75",
|
||||
"RequestMappingsPanelWidth1": "75",
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"Spring Boot.XxlJobAdminApplication.executor": "Debug",
|
||||
"Spring Boot.XxlJobExecutorApplication.executor": "Debug",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"git-widget-placeholder": "main",
|
||||
"ignore.virus.scanning.warn.message": "true",
|
||||
"kotlin-language-version-configured": "true",
|
||||
"last_opened_file_path": "F:/workspace/idea/RuoYi-Vue",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"project.structure.last.edited": "Modules",
|
||||
"project.structure.proportion": "0.15",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"settings.editor.selected.configurable": "MavenSettings",
|
||||
"spring.configuration.checksum": "5e2a1b191f92c123006905465e8e8dc2",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"Application.DataCenterXxlJob.executor": "Run",
|
||||
"Application.DataUtils.executor": "Debug",
|
||||
"Application.GenEntity.executor": "Run",
|
||||
"Maven.xxl-job [clean].executor": "Run",
|
||||
"Maven.xxl-job [install].executor": "Run",
|
||||
"RequestMappingsPanelOrder0": "0",
|
||||
"RequestMappingsPanelOrder1": "1",
|
||||
"RequestMappingsPanelWidth0": "75",
|
||||
"RequestMappingsPanelWidth1": "75",
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"Spring Boot.XxlJobAdminApplication.executor": "Debug",
|
||||
"Spring Boot.XxlJobExecutorApplication.executor": "Debug",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"git-widget-placeholder": "main",
|
||||
"ignore.virus.scanning.warn.message": "true",
|
||||
"kotlin-language-version-configured": "true",
|
||||
"last_opened_file_path": "F:/workspace/idea/RuoYi-Vue",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"project.structure.last.edited": "Modules",
|
||||
"project.structure.proportion": "0.15",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"settings.editor.selected.configurable": "MavenSettings",
|
||||
"spring.configuration.checksum": "5e2a1b191f92c123006905465e8e8dc2",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
},
|
||||
"keyToStringList": {
|
||||
"DatabaseDriversLRU": [
|
||||
"mysql"
|
||||
"keyToStringList": {
|
||||
"DatabaseDriversLRU": [
|
||||
"mysql"
|
||||
]
|
||||
}
|
||||
}</component>
|
||||
}]]></component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="D:\workspace\xxl-job\xxl-job-executor-samples\xxl-job-executor-sample-springboot\src\main\resources\mapper" />
|
||||
|
|
@ -138,8 +131,8 @@
|
|||
</component>
|
||||
<component name="RunAnythingCache">
|
||||
<option name="myCommands">
|
||||
<command value="mvn install" />
|
||||
<command value="mvn clean" />
|
||||
<command value="mvn install" />
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Spring Boot.XxlJobExecutorApplication">
|
||||
|
|
@ -224,9 +217,9 @@
|
|||
</configuration>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Application.DataUtils" />
|
||||
<item itemvalue="Application.GenEntity" />
|
||||
<item itemvalue="Application.DataCenterXxlJob" />
|
||||
<item itemvalue="Application.DataUtils" />
|
||||
<item itemvalue="Application.PostUtils" />
|
||||
<item itemvalue="Application.DateUtil" />
|
||||
</list>
|
||||
|
|
@ -455,6 +448,17 @@
|
|||
<workItem from="1748344149435" duration="913000" />
|
||||
<workItem from="1748914118566" duration="5967000" />
|
||||
<workItem from="1749001278594" duration="43000" />
|
||||
<workItem from="1749001961679" duration="978000" />
|
||||
<workItem from="1749006539290" duration="887000" />
|
||||
<workItem from="1749007891455" duration="5170000" />
|
||||
<workItem from="1749029255453" duration="1220000" />
|
||||
<workItem from="1749031425327" duration="238000" />
|
||||
<workItem from="1749031982529" duration="1186000" />
|
||||
<workItem from="1749033544484" duration="1652000" />
|
||||
<workItem from="1749084407864" duration="999000" />
|
||||
<workItem from="1749105394591" duration="4418000" />
|
||||
<workItem from="1749118085109" duration="66000" />
|
||||
<workItem from="1749118556885" duration="204000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="初始化提交">
|
||||
<option name="closed" value="true" />
|
||||
|
|
@ -667,67 +671,67 @@
|
|||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>249</line>
|
||||
<line>255</line>
|
||||
<option name="timeStamp" value="66" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService.java</url>
|
||||
<line>806</line>
|
||||
<line>804</line>
|
||||
<option name="timeStamp" value="72" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/InterService.java</url>
|
||||
<line>840</line>
|
||||
<line>834</line>
|
||||
<option name="timeStamp" value="73" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>116</line>
|
||||
<line>119</line>
|
||||
<option name="timeStamp" value="90" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>155</line>
|
||||
<line>158</line>
|
||||
<option name="timeStamp" value="92" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>194</line>
|
||||
<line>197</line>
|
||||
<option name="timeStamp" value="93" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>441</line>
|
||||
<line>447</line>
|
||||
<option name="timeStamp" value="97" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>462</line>
|
||||
<line>468</line>
|
||||
<option name="timeStamp" value="98" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>497</line>
|
||||
<line>503</line>
|
||||
<option name="timeStamp" value="99" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>632</line>
|
||||
<line>638</line>
|
||||
<option name="timeStamp" value="102" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>670</line>
|
||||
<line>675</line>
|
||||
<option name="timeStamp" value="103" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>789</line>
|
||||
<line>794</line>
|
||||
<option name="timeStamp" value="106" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>542</line>
|
||||
<line>548</line>
|
||||
<option name="timeStamp" value="109" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-line">
|
||||
|
|
@ -735,11 +739,6 @@
|
|||
<line>41</line>
|
||||
<option name="timeStamp" value="110" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="java-line">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/service/JjBusinessService.java</url>
|
||||
<line>40</line>
|
||||
<option name="timeStamp" value="120" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint type="java-method">
|
||||
<url>file://$PROJECT_DIR$/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/inter/mapper/InterMapper.java</url>
|
||||
<line>71</line>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
### web
|
||||
server.port=28083
|
||||
server.port=58083
|
||||
server.servlet.context-path=/xxl-job-admin
|
||||
### actuator
|
||||
management.server.servlet.context-path=/actuator
|
||||
|
|
@ -26,9 +26,13 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
|
|||
#spring.datasource.url=jdbc:mysql://20.51.8.11:13306/gwjjspaq?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
|
||||
#spring.datasource.username=admin_db
|
||||
#spring.datasource.password=AHdlypt@2023
|
||||
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/gwjjspaq?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||
spring.datasource.username=mroot
|
||||
spring.datasource.password=bonus@admin123
|
||||
#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/gwjjspaq?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||
#spring.datasource.username=mroot
|
||||
#spring.datasource.password=bonus@admin123
|
||||
|
||||
spring.datasource.url=jdbc:mysql://192.168.0.14:4417/gwjjspaq?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||
spring.datasource.username=root
|
||||
spring.datasource.password=Bonus@admin123!
|
||||
|
||||
#spring.datasource.url=jdbc:mysql:///27.50.91.14:13306/gwjjspaq?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||
#spring.datasource.username=admin_db
|
||||
|
|
|
|||
|
|
@ -799,10 +799,8 @@ public class InterService {
|
|||
List<WorkDetailsVo> details=service.getWorkDetails(riskId);
|
||||
StringBuffer workSite=new StringBuffer();
|
||||
StringBuffer content=new StringBuffer();
|
||||
StringBuffer workGx=new StringBuffer();
|
||||
List<String> gxList=new ArrayList<>();
|
||||
List<String> typeList=new ArrayList<>();
|
||||
StringBuffer workType=new StringBuffer();
|
||||
if(details!=null && details.size()>0){
|
||||
details.forEach(vo->{
|
||||
if(StringHelper.isNotEmpty(vo.getWorkSite())){
|
||||
|
|
@ -822,17 +820,13 @@ public class InterService {
|
|||
if(!gxList.contains(vo.getWorkGx())){
|
||||
gxList.add(vo.getWorkGx());
|
||||
}
|
||||
// workGx=String.join(";",gxList);
|
||||
|
||||
}
|
||||
if(StringHelper.isNotEmpty(vo.getWorkType())){
|
||||
if(!typeList.contains(vo.getWorkType())){
|
||||
typeList.add(vo.getWorkType());
|
||||
}
|
||||
// if(StringHelper.isNotEmpty(workType.toString())){
|
||||
// workType.append(";");
|
||||
// }
|
||||
// workType.append(vo.getWorkType());
|
||||
|
||||
}
|
||||
});
|
||||
workDetailsVo.setWorkType(String.join(";",typeList));
|
||||
|
|
|
|||
|
|
@ -64,14 +64,17 @@ public class JjBusinessService {
|
|||
if(num==null || num==0){
|
||||
vo.setWarnDay(DateUtil.getNowDate());
|
||||
String workContent=getContent(vo.getTicketId());
|
||||
vo.setWorkContent(workContent);
|
||||
List<String> isAdd=mapper.getAddWarn(vo);
|
||||
if(isAdd==null || isAdd.isEmpty()) {
|
||||
mapper.insertWarnInfo(vo);
|
||||
}else{
|
||||
vo.setKeyId(isAdd.get(0));
|
||||
mapper.updateWarnInfo(vo);
|
||||
if(StringHelper.isNotEmpty(workContent)){
|
||||
vo.setWorkContent(workContent);
|
||||
List<String> isAdd=mapper.getAddWarn(vo);
|
||||
if(isAdd==null || isAdd.isEmpty()) {
|
||||
mapper.insertWarnInfo(vo);
|
||||
}else{
|
||||
vo.setKeyId(isAdd.get(0));
|
||||
mapper.updateWarnInfo(vo);
|
||||
}
|
||||
}
|
||||
|
||||
}else{
|
||||
//删除施工告警数据
|
||||
mapper.delNoWorkList(vo);
|
||||
|
|
@ -202,6 +205,9 @@ public class JjBusinessService {
|
|||
try{
|
||||
List<JjBusinessInfoVo> list=mapper.getTodayClassList();
|
||||
for (JjBusinessInfoVo vo:list){
|
||||
if("7qtlledcavxUZDNsmN81748986821102".equals(vo.getTClassId())){
|
||||
System.err.println(22);
|
||||
}
|
||||
vo.setType("5");
|
||||
vo.setWarnType("工序变化");
|
||||
vo.setWarnDay(DateUtil.getNowDate());
|
||||
|
|
@ -646,7 +652,6 @@ public class JjBusinessService {
|
|||
List<JjBusinessInfoVo> allList=mapper.getNoWorkList(param);
|
||||
for (JjBusinessInfoVo jjBusinessInfoVo:allList){
|
||||
Integer num=mapper.getTodayCameraNum(jjBusinessInfoVo);
|
||||
|
||||
if(num!=null && num>0){
|
||||
mapper.delWarnInfo(jjBusinessInfoVo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ public class DataUtils {
|
|||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.err.println(DataUtils.getProTime());
|
||||
System.err.println(DataUtils.getTimes2());
|
||||
}
|
||||
public static JSONObject getJsonObject2(int pageNum){
|
||||
JSONObject obj = new JSONObject();
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ public class JJBusinessXxlJob {
|
|||
* 预警管理-今日未施工
|
||||
*/
|
||||
@XxlJob("todayNoWork")
|
||||
@PostConstruct
|
||||
public void todayNoWork(){
|
||||
service.todayNoWork();
|
||||
}
|
||||
|
|
@ -31,7 +30,6 @@ public class JJBusinessXxlJob {
|
|||
* 预警管理-今日未施工
|
||||
*/
|
||||
@XxlJob("todayNewTeam")
|
||||
@PostConstruct
|
||||
public void todayNewTeam(){
|
||||
service.todayNewTeam();
|
||||
}
|
||||
|
|
@ -40,7 +38,6 @@ public class JJBusinessXxlJob {
|
|||
* 预警管理-近七日未施工
|
||||
*/
|
||||
@XxlJob("todaySevenNoWork")
|
||||
@PostConstruct
|
||||
public void todaySevenNoWork(){
|
||||
service.todaySevenNoWork();
|
||||
}
|
||||
|
|
@ -48,7 +45,6 @@ public class JJBusinessXxlJob {
|
|||
* 预警管理-人数变化大
|
||||
*/
|
||||
@XxlJob("todayUseNumChange")
|
||||
@PostConstruct
|
||||
public void todayUseNumChange(){
|
||||
service.todayUseNumChange();
|
||||
}
|
||||
|
|
@ -66,7 +62,6 @@ public class JJBusinessXxlJob {
|
|||
* 预警管理-作业类型变化
|
||||
*/
|
||||
@XxlJob("todayWorkChange")
|
||||
@PostConstruct
|
||||
public void todayWorkChange(){
|
||||
service.todayWorkChange();
|
||||
}
|
||||
|
|
@ -85,7 +80,6 @@ public class JJBusinessXxlJob {
|
|||
* 球机不足预警
|
||||
*/
|
||||
@XxlJob("startEndWork")
|
||||
@PostConstruct
|
||||
public void startEndWork(){
|
||||
service.startEndWork();
|
||||
}
|
||||
|
|
@ -94,7 +88,6 @@ public class JJBusinessXxlJob {
|
|||
* 球机配置少
|
||||
*/
|
||||
@XxlJob("getBallFew")
|
||||
@PostConstruct
|
||||
public void getBallFew(){
|
||||
service.getBallFew();
|
||||
}
|
||||
|
|
@ -103,7 +96,6 @@ public class JJBusinessXxlJob {
|
|||
* 球机在线时长不足
|
||||
*/
|
||||
@XxlJob("getBallUpDown")
|
||||
@PostConstruct
|
||||
public void getBallUpDown(){
|
||||
service.getBallUpDown();
|
||||
}
|
||||
|
|
@ -111,7 +103,6 @@ public class JJBusinessXxlJob {
|
|||
* 对施工班组进行初始化添加
|
||||
*/
|
||||
@XxlJob("addNewTeam")
|
||||
@PostConstruct
|
||||
private void addNewTeam(){
|
||||
service.addNewTeam();
|
||||
}
|
||||
|
|
@ -121,7 +112,6 @@ public class JJBusinessXxlJob {
|
|||
* 未执行工序
|
||||
*/
|
||||
@XxlJob("getWorkGxNoWork")
|
||||
@PostConstruct
|
||||
public void getWorkGxNoWork(){
|
||||
service.getWorkGxNoWork();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
# web port
|
||||
server.port=28084
|
||||
server.port=18084
|
||||
# no web
|
||||
#spring.main.web-environment=false
|
||||
# log config
|
||||
logging.config=classpath:logback.xml
|
||||
#xxl.job.admin.addresses=http://20.51.8.10:18083/xxl-job-admin
|
||||
xxl.job.admin.addresses=http://127.0.0.1:28083/xxl-job-admin
|
||||
xxl.job.admin.addresses=http://20.51.8.9:18083/xxl-job-admin
|
||||
#xxl.job.admin.addresses=http://127.0.0.1:28083/xxl-job-admin
|
||||
#xxl.job.admin.addresses=http://192.168.0.14:58883/xxl-job-admin
|
||||
### xxl-job, access token
|
||||
xxl.job.accessToken=default_token
|
||||
### xxl-job executor appname
|
||||
|
|
@ -26,13 +27,13 @@ mybatis.mapper-locations=classpath:/mapper/*Mapper.xml
|
|||
#spring.datasource.url=jdbc:mysql://20.51.8.11:13306/gwjjspaq?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
|
||||
#spring.datasource.username=admin_db
|
||||
#spring.datasource.password=AHdlypt@2023
|
||||
#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/gwjjspaq?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||
#spring.datasource.username=mroot
|
||||
#spring.datasource.password=bonus@admin123
|
||||
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/gwjjspaq?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||
spring.datasource.username=mroot
|
||||
spring.datasource.password=bonus@admin123
|
||||
|
||||
spring.datasource.url=jdbc:mysql://192.168.0.14:4417/gwjjspaq?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||
spring.datasource.username=root
|
||||
spring.datasource.password=Bonus@admin123!
|
||||
#spring.datasource.url=jdbc:mysql://192.168.0.14:4417/gwjjspaq?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=Bonus@admin123!
|
||||
|
||||
#spring.datasource.url=jdbc:mysql:///27.50.91.14:13306/gwjjspaq?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||
#spring.datasource.username=admin_db
|
||||
|
|
|
|||
|
|
@ -1,264 +0,0 @@
|
|||
12:24:46.457 [main] ERROR c.a.c.n.c.NacosPropertySourceBuilder - [loadNacosData,104] - parse data from Nacos error,dataId:vsc-dev.yml,data:spring:
|
||||
main:
|
||||
allow-circular-references: true
|
||||
allow-bean-definition-overriding: true
|
||||
autoconfigure:
|
||||
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
|
||||
mvc:
|
||||
pathmatch:
|
||||
matching-strategy: ant_path_matcher
|
||||
cloud:
|
||||
sentinel:
|
||||
filter:
|
||||
# sentinel 在 springboot 2.6.x 不兼容问题的处理
|
||||
enabled: false
|
||||
knife4j:
|
||||
basic:
|
||||
enable: true
|
||||
|
||||
# feign 配置
|
||||
feign:
|
||||
sentinel:
|
||||
enabled: true
|
||||
okhttp:
|
||||
enabled: true
|
||||
httpclient:
|
||||
enabled: false
|
||||
client:
|
||||
config:
|
||||
default:
|
||||
connectTimeout: 10000
|
||||
readTimeout: 10000
|
||||
compression:
|
||||
request:
|
||||
enabled: true
|
||||
response:
|
||||
enabled: true
|
||||
|
||||
# 暴露监控端点
|
||||
management:
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
include: '*'
|
||||
#加密组件
|
||||
jasypt:
|
||||
encryptor:
|
||||
password: Encrypt
|
||||
|
||||
|
||||
|
||||
org.yaml.snakeyaml.error.YAMLException: java.nio.charset.MalformedInputException: Input length = 1
|
||||
at org.yaml.snakeyaml.reader.StreamReader.update(StreamReader.java:218)
|
||||
at org.yaml.snakeyaml.reader.StreamReader.ensureEnoughData(StreamReader.java:176)
|
||||
at org.yaml.snakeyaml.reader.StreamReader.ensureEnoughData(StreamReader.java:171)
|
||||
at org.yaml.snakeyaml.reader.StreamReader.peek(StreamReader.java:126)
|
||||
at org.yaml.snakeyaml.scanner.ScannerImpl.scanToNextToken(ScannerImpl.java:1218)
|
||||
at org.yaml.snakeyaml.scanner.ScannerImpl.fetchMoreTokens(ScannerImpl.java:329)
|
||||
at org.yaml.snakeyaml.scanner.ScannerImpl.checkToken(ScannerImpl.java:251)
|
||||
at org.yaml.snakeyaml.parser.ParserImpl$ParseImplicitDocumentStart.produce(ParserImpl.java:214)
|
||||
at org.yaml.snakeyaml.parser.ParserImpl.peekEvent(ParserImpl.java:166)
|
||||
at org.yaml.snakeyaml.parser.ParserImpl.checkEvent(ParserImpl.java:156)
|
||||
at org.yaml.snakeyaml.composer.Composer.checkNode(Composer.java:93)
|
||||
at org.yaml.snakeyaml.constructor.BaseConstructor.checkData(BaseConstructor.java:124)
|
||||
at org.yaml.snakeyaml.Yaml$1.hasNext(Yaml.java:509)
|
||||
at org.springframework.beans.factory.config.YamlProcessor.process(YamlProcessor.java:198)
|
||||
at org.springframework.beans.factory.config.YamlProcessor.process(YamlProcessor.java:166)
|
||||
at org.springframework.boot.env.OriginTrackedYamlLoader.load(OriginTrackedYamlLoader.java:84)
|
||||
at org.springframework.boot.env.YamlPropertySourceLoader.load(YamlPropertySourceLoader.java:50)
|
||||
at com.alibaba.cloud.nacos.parser.NacosDataParserHandler.parseNacosData(NacosDataParserHandler.java:92)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceBuilder.loadNacosData(NacosPropertySourceBuilder.java:97)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceBuilder.build(NacosPropertySourceBuilder.java:73)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceLocator.loadNacosPropertySource(NacosPropertySourceLocator.java:199)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceLocator.loadNacosDataIfPresent(NacosPropertySourceLocator.java:186)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceLocator.loadNacosConfiguration(NacosPropertySourceLocator.java:158)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceLocator.loadSharedConfiguration(NacosPropertySourceLocator.java:116)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceLocator.locate(NacosPropertySourceLocator.java:101)
|
||||
at org.springframework.cloud.bootstrap.config.PropertySourceLocator.locateCollection(PropertySourceLocator.java:51)
|
||||
at org.springframework.cloud.bootstrap.config.PropertySourceLocator.locateCollection(PropertySourceLocator.java:47)
|
||||
at org.springframework.cloud.bootstrap.config.PropertySourceBootstrapConfiguration.initialize(PropertySourceBootstrapConfiguration.java:95)
|
||||
at org.springframework.boot.SpringApplication.applyInitializers(SpringApplication.java:607)
|
||||
at org.springframework.boot.SpringApplication.prepareContext(SpringApplication.java:373)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:307)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1306)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1295)
|
||||
at com.sercurityControl.proteam.VscProTeamApplication.main(VscProTeamApplication.java:38)
|
||||
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
|
||||
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
|
||||
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
|
||||
at java.lang.reflect.Method.invoke(Method.java:498)
|
||||
at org.springframework.boot.loader.MainMethodRunner.run(MainMethodRunner.java:49)
|
||||
at org.springframework.boot.loader.Launcher.launch(Launcher.java:108)
|
||||
at org.springframework.boot.loader.Launcher.launch(Launcher.java:58)
|
||||
at org.springframework.boot.loader.JarLauncher.main(JarLauncher.java:65)
|
||||
Caused by: java.nio.charset.MalformedInputException: Input length = 1
|
||||
at java.nio.charset.CoderResult.throwException(CoderResult.java:281)
|
||||
at sun.nio.cs.StreamDecoder.implRead(StreamDecoder.java:339)
|
||||
at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:178)
|
||||
at java.io.InputStreamReader.read(InputStreamReader.java:184)
|
||||
at org.yaml.snakeyaml.reader.UnicodeReader.read(UnicodeReader.java:125)
|
||||
at org.yaml.snakeyaml.reader.StreamReader.update(StreamReader.java:183)
|
||||
... 41 common frames omitted
|
||||
12:24:46.467 [main] ERROR c.a.c.n.c.NacosPropertySourceBuilder - [loadNacosData,104] - parse data from Nacos error,dataId:securityControl-proteam,data:# spring配置
|
||||
spring:
|
||||
redis:
|
||||
host: 127.0.0.1
|
||||
port: 6379
|
||||
datasource:
|
||||
druid:
|
||||
stat-view-servlet:
|
||||
enabled: true
|
||||
loginUsername: admin
|
||||
loginPassword: 1q2w3e4r!
|
||||
dynamic:
|
||||
druid:
|
||||
initial-size: 5
|
||||
min-idle: 5
|
||||
maxActive: 20
|
||||
maxWait: 60000
|
||||
timeBetweenEvictionRunsMillis: 60000
|
||||
minEvictableIdleTimeMillis: 300000
|
||||
validationQuery: SELECT 1 FROM DUAL
|
||||
testWhileIdle: true
|
||||
testOnBorrow: false
|
||||
testOnReturn: false
|
||||
poolPreparedStatements: true
|
||||
maxPoolPreparedStatementPerConnectionSize: 20
|
||||
filters: stat,slf4j
|
||||
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
|
||||
datasource:
|
||||
# 主库数据源
|
||||
master:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
# url: jdbc:mysql://192.168.0.7:13306/gwjjspaq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://127.0.0.1:3306/gwjjspaq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: mroot
|
||||
# password: Bonus@admin123!
|
||||
password: bonus@admin123
|
||||
# password: CodeSheep(YtvjyFk2zAQ0Td8AxJgfy+Ax2EK72Oy1OctBe3y73qZoN+73RutCdAriCRV1kNg8)
|
||||
# password: CodeSheep(PubczXlVswphiFjxsMBs7RmQTiig3PvH3DduG4EW8XAbTtaCA23m8hCxWJukh0za)
|
||||
# 从库数据源
|
||||
# slave:
|
||||
# username:
|
||||
# password:
|
||||
# url:
|
||||
# driver-class-name:
|
||||
|
||||
# mybatis配置
|
||||
mybatis:
|
||||
# 搜索指定包别名
|
||||
typeAliasesPackage: com.securityControl.proteam
|
||||
# 配置mapper的扫描，找到所有的mapper.xml映射文件
|
||||
mapperLocations: classpath:mapper/**/*.xml
|
||||
|
||||
# swagger配置
|
||||
swagger:
|
||||
title: 班组模块接口文档
|
||||
license: czc
|
||||
isc:
|
||||
url_xn: http://27.196.3.66:18001/isc_sso
|
||||
targetIndex: http://27.196.164.56:21001/ahsfs/bns/html/home/home.html
|
||||
url_aq: http://xdl.sgccid.com:22002/isc_sso
|
||||
appId: 9b4483c383538275018615493e1451ea
|
||||
whiteURL: 27.196.156.43
|
||||
video:
|
||||
address: 127.0.0.1
|
||||
username: Pass456
|
||||
password: Pass345
|
||||
start: 1
|
||||
file:
|
||||
path: D:/upload
|
||||
ai:
|
||||
url: 127.0.0.1
|
||||
org.yaml.snakeyaml.error.YAMLException: java.nio.charset.MalformedInputException: Input length = 1
|
||||
at org.yaml.snakeyaml.reader.StreamReader.update(StreamReader.java:218)
|
||||
at org.yaml.snakeyaml.reader.StreamReader.ensureEnoughData(StreamReader.java:176)
|
||||
at org.yaml.snakeyaml.reader.StreamReader.ensureEnoughData(StreamReader.java:171)
|
||||
at org.yaml.snakeyaml.reader.StreamReader.peek(StreamReader.java:126)
|
||||
at org.yaml.snakeyaml.scanner.ScannerImpl.scanToNextToken(ScannerImpl.java:1218)
|
||||
at org.yaml.snakeyaml.scanner.ScannerImpl.fetchMoreTokens(ScannerImpl.java:329)
|
||||
at org.yaml.snakeyaml.scanner.ScannerImpl.checkToken(ScannerImpl.java:251)
|
||||
at org.yaml.snakeyaml.parser.ParserImpl$ParseImplicitDocumentStart.produce(ParserImpl.java:214)
|
||||
at org.yaml.snakeyaml.parser.ParserImpl.peekEvent(ParserImpl.java:166)
|
||||
at org.yaml.snakeyaml.parser.ParserImpl.checkEvent(ParserImpl.java:156)
|
||||
at org.yaml.snakeyaml.composer.Composer.checkNode(Composer.java:93)
|
||||
at org.yaml.snakeyaml.constructor.BaseConstructor.checkData(BaseConstructor.java:124)
|
||||
at org.yaml.snakeyaml.Yaml$1.hasNext(Yaml.java:509)
|
||||
at org.springframework.beans.factory.config.YamlProcessor.process(YamlProcessor.java:198)
|
||||
at org.springframework.beans.factory.config.YamlProcessor.process(YamlProcessor.java:166)
|
||||
at org.springframework.boot.env.OriginTrackedYamlLoader.load(OriginTrackedYamlLoader.java:84)
|
||||
at org.springframework.boot.env.YamlPropertySourceLoader.load(YamlPropertySourceLoader.java:50)
|
||||
at com.alibaba.cloud.nacos.parser.NacosDataParserHandler.parseNacosData(NacosDataParserHandler.java:92)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceBuilder.loadNacosData(NacosPropertySourceBuilder.java:97)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceBuilder.build(NacosPropertySourceBuilder.java:73)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceLocator.loadNacosPropertySource(NacosPropertySourceLocator.java:199)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceLocator.loadNacosDataIfPresent(NacosPropertySourceLocator.java:186)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceLocator.loadApplicationConfiguration(NacosPropertySourceLocator.java:141)
|
||||
at com.alibaba.cloud.nacos.client.NacosPropertySourceLocator.locate(NacosPropertySourceLocator.java:103)
|
||||
at org.springframework.cloud.bootstrap.config.PropertySourceLocator.locateCollection(PropertySourceLocator.java:51)
|
||||
at org.springframework.cloud.bootstrap.config.PropertySourceLocator.locateCollection(PropertySourceLocator.java:47)
|
||||
at org.springframework.cloud.bootstrap.config.PropertySourceBootstrapConfiguration.initialize(PropertySourceBootstrapConfiguration.java:95)
|
||||
at org.springframework.boot.SpringApplication.applyInitializers(SpringApplication.java:607)
|
||||
at org.springframework.boot.SpringApplication.prepareContext(SpringApplication.java:373)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:307)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1306)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1295)
|
||||
at com.sercurityControl.proteam.VscProTeamApplication.main(VscProTeamApplication.java:38)
|
||||
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
|
||||
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
|
||||
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
|
||||
at java.lang.reflect.Method.invoke(Method.java:498)
|
||||
at org.springframework.boot.loader.MainMethodRunner.run(MainMethodRunner.java:49)
|
||||
at org.springframework.boot.loader.Launcher.launch(Launcher.java:108)
|
||||
at org.springframework.boot.loader.Launcher.launch(Launcher.java:58)
|
||||
at org.springframework.boot.loader.JarLauncher.main(JarLauncher.java:65)
|
||||
Caused by: java.nio.charset.MalformedInputException: Input length = 1
|
||||
at java.nio.charset.CoderResult.throwException(CoderResult.java:281)
|
||||
at sun.nio.cs.StreamDecoder.implRead(StreamDecoder.java:339)
|
||||
at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:178)
|
||||
at java.io.InputStreamReader.read(InputStreamReader.java:184)
|
||||
at org.yaml.snakeyaml.reader.UnicodeReader.read(UnicodeReader.java:125)
|
||||
at org.yaml.snakeyaml.reader.StreamReader.update(StreamReader.java:183)
|
||||
... 40 common frames omitted
|
||||
12:24:58.056 [main] ERROR o.s.b.SpringApplication - [reportFailure,824] - Application run failed
|
||||
org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'com.securityControl.common.security.service.TokenService': Injection of autowired dependencies failed; nested exception is java.lang.IllegalArgumentException: Could not resolve placeholder 'isc.url_aq' in value "${isc.url_aq}"
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:405)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1431)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:619)
|
||||
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:542)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335)
|
||||
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:955)
|
||||
at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:918)
|
||||
at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:583)
|
||||
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:147)
|
||||
at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:734)
|
||||
at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:408)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:308)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1306)
|
||||
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1295)
|
||||
at com.sercurityControl.proteam.VscProTeamApplication.main(VscProTeamApplication.java:38)
|
||||
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
|
||||
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
|
||||
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
|
||||
at java.lang.reflect.Method.invoke(Method.java:498)
|
||||
at org.springframework.boot.loader.MainMethodRunner.run(MainMethodRunner.java:49)
|
||||
at org.springframework.boot.loader.Launcher.launch(Launcher.java:108)
|
||||
at org.springframework.boot.loader.Launcher.launch(Launcher.java:58)
|
||||
at org.springframework.boot.loader.JarLauncher.main(JarLauncher.java:65)
|
||||
Caused by: java.lang.IllegalArgumentException: Could not resolve placeholder 'isc.url_aq' in value "${isc.url_aq}"
|
||||
at org.springframework.util.PropertyPlaceholderHelper.parseStringValue(PropertyPlaceholderHelper.java:180)
|
||||
at org.springframework.util.PropertyPlaceholderHelper.replacePlaceholders(PropertyPlaceholderHelper.java:126)
|
||||
at org.springframework.core.env.AbstractPropertyResolver.doResolvePlaceholders(AbstractPropertyResolver.java:239)
|
||||
at org.springframework.core.env.AbstractPropertyResolver.resolveRequiredPlaceholders(AbstractPropertyResolver.java:210)
|
||||
at org.springframework.context.support.PropertySourcesPlaceholderConfigurer.lambda$processProperties$0(PropertySourcesPlaceholderConfigurer.java:191)
|
||||
at org.springframework.beans.factory.support.AbstractBeanFactory.resolveEmbeddedValue(AbstractBeanFactory.java:936)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1332)
|
||||
at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1311)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.resolveFieldValue(AutowiredAnnotationBeanPostProcessor.java:656)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:639)
|
||||
at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:119)
|
||||
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399)
|
||||
... 25 common frames omitted
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
12:24:39.799 [background-preinit] INFO o.h.v.i.util.Version - [<clinit>,21] - HV000001: Hibernate Validator 6.2.4.Final
|
||||
12:24:41.818 [main] INFO c.a.n.c.r.client - [lambda$createClient$0,80] - [RpcClientFactory] create a new rpc client of 41c9f4f0-ff4b-4bdd-a134-93a224e3c10e_config-0
|
||||
12:24:42.001 [main] INFO o.r.Reflections - [scan,232] - Reflections took 126 ms to scan 1 urls, producing 3 keys and 6 values
|
||||
12:24:42.106 [main] INFO o.r.Reflections - [scan,232] - Reflections took 75 ms to scan 1 urls, producing 4 keys and 9 values
|
||||
12:24:42.181 [main] INFO o.r.Reflections - [scan,232] - Reflections took 72 ms to scan 1 urls, producing 3 keys and 10 values
|
||||
12:24:43.096 [main] INFO o.r.Reflections - [scan,232] - Reflections took 910 ms to scan 328 urls, producing 0 keys and 0 values
|
||||
12:24:43.194 [main] INFO o.r.Reflections - [scan,232] - Reflections took 89 ms to scan 1 urls, producing 1 keys and 5 values
|
||||
12:24:43.285 [main] INFO o.r.Reflections - [scan,232] - Reflections took 87 ms to scan 1 urls, producing 1 keys and 7 values
|
||||
12:24:43.360 [main] INFO o.r.Reflections - [scan,232] - Reflections took 72 ms to scan 1 urls, producing 2 keys and 8 values
|
||||
12:24:44.278 [main] INFO o.r.Reflections - [scan,232] - Reflections took 914 ms to scan 328 urls, producing 0 keys and 0 values
|
||||
12:24:44.279 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,60] - [41c9f4f0-ff4b-4bdd-a134-93a224e3c10e_config-0] RpcClient init label, labels = {module=config, Vipserver-Tag=null, source=sdk, Amory-Tag=null, Location-Tag=null, taskId=0, AppName=unknown}
|
||||
12:24:44.280 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,60] - [41c9f4f0-ff4b-4bdd-a134-93a224e3c10e_config-0] Register server push request handler:com.alibaba.nacos.client.config.impl.ClientWorker$ConfigRpcTransportClient$$Lambda$341/1210898719
|
||||
12:24:44.281 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,60] - [41c9f4f0-ff4b-4bdd-a134-93a224e3c10e_config-0] Register server push request handler:com.alibaba.nacos.client.config.impl.ClientWorker$ConfigRpcTransportClient$$Lambda$342/306123060
|
||||
12:24:44.281 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,60] - [41c9f4f0-ff4b-4bdd-a134-93a224e3c10e_config-0] Registry connection listener to current client:com.alibaba.nacos.client.config.impl.ClientWorker$ConfigRpcTransportClient$1
|
||||
12:24:44.282 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,60] - [41c9f4f0-ff4b-4bdd-a134-93a224e3c10e_config-0] RpcClient init, ServerListFactory = com.alibaba.nacos.client.config.impl.ClientWorker$ConfigRpcTransportClient$2
|
||||
12:24:44.290 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,60] - [41c9f4f0-ff4b-4bdd-a134-93a224e3c10e_config-0] Try to connect to server on start up, server: {serverIp = '127.0.0.1', server main port = 18848}
|
||||
12:24:46.394 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,60] - [41c9f4f0-ff4b-4bdd-a134-93a224e3c10e_config-0] Success to connect to server [127.0.0.1:18848] on start up, connectionId = 1748319886194_127.0.0.1_8672
|
||||
12:24:46.395 [com.alibaba.nacos.client.remote.worker] INFO c.a.n.c.r.client - [printIfInfoEnabled,60] - [41c9f4f0-ff4b-4bdd-a134-93a224e3c10e_config-0] Notify connected event to listeners.
|
||||
12:24:46.396 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,60] - [41c9f4f0-ff4b-4bdd-a134-93a224e3c10e_config-0] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$ConnectResetRequestHandler
|
||||
12:24:46.397 [main] INFO c.a.n.c.r.client - [printIfInfoEnabled,60] - [41c9f4f0-ff4b-4bdd-a134-93a224e3c10e_config-0] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$$Lambda$350/494317290
|
||||
12:24:46.516 [main] INFO c.s.p.VscProTeamApplication - [logStartupProfileInfo,640] - The following 1 profile is active: "dev"
|
||||
12:24:49.233 [main] INFO c.u.j.c.EnableEncryptablePropertiesBeanFactoryPostProcessor - [postProcessBeanFactory,48] - Post-processing PropertySource instances
|
||||
12:24:49.287 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource bootstrapProperties-securityControl-proteam-dev.yml,DEFAULT_GROUP [org.springframework.cloud.bootstrap.config.BootstrapPropertySource] to EncryptableEnumerablePropertySourceWrapper
|
||||
12:24:49.288 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource bootstrapProperties-securityControl-proteam.yml,DEFAULT_GROUP [org.springframework.cloud.bootstrap.config.BootstrapPropertySource] to EncryptableEnumerablePropertySourceWrapper
|
||||
12:24:49.288 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource bootstrapProperties-securityControl-proteam,DEFAULT_GROUP [org.springframework.cloud.bootstrap.config.BootstrapPropertySource] to EncryptableEnumerablePropertySourceWrapper
|
||||
12:24:49.288 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource bootstrapProperties-vsc-dev.yml,DEFAULT_GROUP [org.springframework.cloud.bootstrap.config.BootstrapPropertySource] to EncryptableEnumerablePropertySourceWrapper
|
||||
12:24:49.328 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource configurationProperties [org.springframework.boot.context.properties.source.ConfigurationPropertySourcesPropertySource] to AOP Proxy
|
||||
12:24:49.328 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource servletConfigInitParams [org.springframework.core.env.PropertySource$StubPropertySource] to EncryptablePropertySourceWrapper
|
||||
12:24:49.329 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource servletContextInitParams [org.springframework.core.env.PropertySource$StubPropertySource] to EncryptablePropertySourceWrapper
|
||||
12:24:49.329 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource systemProperties [org.springframework.core.env.PropertiesPropertySource] to EncryptableMapPropertySourceWrapper
|
||||
12:24:49.329 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource systemEnvironment [org.springframework.boot.env.SystemEnvironmentPropertySourceEnvironmentPostProcessor$OriginAwareSystemEnvironmentPropertySource] to EncryptableSystemEnvironmentPropertySourceWrapper
|
||||
12:24:49.329 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource random [org.springframework.boot.env.RandomValuePropertySource] to EncryptablePropertySourceWrapper
|
||||
12:24:49.331 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource cachedrandom [org.springframework.cloud.util.random.CachedRandomPropertySource] to EncryptablePropertySourceWrapper
|
||||
12:24:49.331 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource springCloudClientHostInfo [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
|
||||
12:24:49.331 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource Config resource 'file [application.properties]' via location 'optional:file:./' [org.springframework.boot.env.OriginTrackedMapPropertySource] to EncryptableMapPropertySourceWrapper
|
||||
12:24:49.331 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource Config resource 'class path resource [bootstrap.yml]' via location 'optional:classpath:/' [org.springframework.boot.env.OriginTrackedMapPropertySource] to EncryptableMapPropertySourceWrapper
|
||||
12:24:49.331 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource springCloudDefaultProperties [org.springframework.core.env.MapPropertySource] to EncryptableMapPropertySourceWrapper
|
||||
12:24:49.332 [main] INFO c.u.j.EncryptablePropertySourceConverter - [makeEncryptable,44] - Converting PropertySource class path resource [crypto.properties] [org.springframework.core.io.support.ResourcePropertySource] to EncryptableMapPropertySourceWrapper
|
||||
12:24:49.437 [main] INFO c.u.j.f.DefaultLazyPropertyFilter - [lambda$null$2,31] - Property Filter custom Bean not found with name 'encryptablePropertyFilter'. Initializing Default Property Filter
|
||||
12:24:50.381 [main] INFO c.u.j.r.DefaultLazyPropertyResolver - [lambda$null$2,35] - Property Resolver custom Bean not found with name 'encryptablePropertyResolver'. Initializing Default Property Resolver
|
||||
12:24:50.386 [main] INFO c.u.j.d.DefaultLazyPropertyDetector - [lambda$null$2,35] - Property Detector custom Bean not found with name 'encryptablePropertyDetector'. Initializing Default Property Detector
|
||||
12:24:50.823 [main] INFO o.a.c.h.Http11NioProtocol - [log,173] - Initializing ProtocolHandler ["http-nio-28084"]
|
||||
12:24:50.824 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
|
||||
12:24:50.825 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/9.0.65]
|
||||
12:24:51.034 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
|
||||
12:24:55.491 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**].
|
||||
12:24:57.857 [main] INFO c.s.i.s.a.f.a.c.ConfigHolder - [getServiceAgentConfiguration,53] - 鉴权代理加载配置文件iscservicesadapter中默认配置信息......
|
||||
12:24:57.916 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,211] - dynamic-datasource start closing ....
|
||||
12:24:57.917 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,215] - dynamic-datasource all closed success,bye
|
||||
12:24:57.918 [main] INFO o.a.c.c.StandardService - [log,173] - Stopping service [Tomcat]
|
||||
|
|
@ -57,9 +57,10 @@
|
|||
|
||||
|
||||
<select id="getTodayTicketList" resultType="com.xxl.job.executor.inter.vo.JjBusinessInfoVo">
|
||||
select jt.working_team_name workTeam,jt.planned_start_date startTime,jt.planned_end_date endTime,jt.start_time ,jtp.real_name relName,jtp.mobile,
|
||||
select jt.working_team_name workTeam,jt.planned_start_date startTime,jt.planned_end_date endTime,jt.start_time ,jtp.real_name relName,
|
||||
jtp.mobile phone,
|
||||
jt.construction_headcount workNum, jt.id ticketId,jt.voltage_level voltageLevel,
|
||||
jt.ticket_no ticketNo,jt.build_unit_code orgId,jtp.id_card idCard,jt.voltage_level voltageLevel,
|
||||
jt.ticket_no ticketNo,jt.build_unit_code orgId,jtp.id_card idCard,
|
||||
jt.re_assessment_risk_level riskLevel,jt.single_project_name proName
|
||||
from jj_ticket jt
|
||||
left join jj_class_metting_info jcmi on jt.team_id=jcmi.team_id and jcmi.work_day=CURRENT_DATE
|
||||
|
|
@ -182,7 +183,7 @@
|
|||
left join jj_class_metting_info jcmi on jcmi.class_id=jcm.id
|
||||
where jcm.current_constr_date=DATE_SUB(CURDATE(),INTERVAL 1 day)
|
||||
and jcmi.work_manage_num=#{idCard}
|
||||
ORDER BY jcm.create_time ASC
|
||||
ORDER BY jcm.create_time desc
|
||||
LIMIT 1
|
||||
</select>
|
||||
<select id="getAddWorkType" resultType="com.xxl.job.executor.inter.vo.WorkGxVo">
|
||||
|
|
@ -414,7 +415,7 @@
|
|||
jt.re_assessment_risk_level riskLevel,jt.single_project_name proName
|
||||
from jj_ticket jt
|
||||
left join jj_ticket_people jtp ON jt.id=jtp.ticket_id and jtp.position_code='0900101'
|
||||
where jt.id=#{ticketId}
|
||||
where jt.id=#{ticketId} and jtp.mobile is not null
|
||||
|
||||
</select>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue