修改提交
This commit is contained in:
parent
74b54c7488
commit
f2105f7cf5
File diff suppressed because it is too large
Load Diff
2418
doc/XXL-JOB官方文档.md
2418
doc/XXL-JOB官方文档.md
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 792 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 114 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 48 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 130 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 104 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 66 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 284 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 129 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 65 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 41 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 135 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 286 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 349 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 95 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 209 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 50 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 227 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 180 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 65 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 110 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 252 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 86 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 150 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 267 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 163 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 438 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
### web
|
||||
server.port=8080
|
||||
server.port=28083
|
||||
server.servlet.context-path=/xxl-job-admin
|
||||
|
||||
### actuator
|
||||
|
|
@ -24,11 +24,17 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
|
|||
#mybatis.type-aliases-package=com.xxl.job.admin.core.model
|
||||
|
||||
### xxl-job, datasource
|
||||
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||
#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=root
|
||||
spring.datasource.password=bonus@admin123
|
||||
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||
|
||||
# url: jdbc:mysql://10.138.109.50:28700/jj_zhgd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
# username: admin_db
|
||||
# password: AHdlypt@2024
|
||||
### datasource-pool
|
||||
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
|
||||
spring.datasource.hikari.minimum-idle=10
|
||||
|
|
@ -63,4 +69,4 @@ xxl.job.triggerpool.fast.max=200
|
|||
xxl.job.triggerpool.slow.max=100
|
||||
|
||||
### xxl-job, log retention days
|
||||
xxl.job.logretentiondays=30
|
||||
xxl.job.logretentiondays=2
|
||||
|
|
|
|||
|
|
@ -102,6 +102,13 @@ public class DateUtil {
|
|||
return parse(dateString, DATETIME_FORMAT);
|
||||
}
|
||||
|
||||
public static String getNowDate(){
|
||||
return formatDate(new Date());
|
||||
}
|
||||
public static String getNowTime(){
|
||||
return formatDateTime(new Date());
|
||||
}
|
||||
|
||||
/**
|
||||
* parse date
|
||||
*
|
||||
|
|
|
|||
|
|
@ -77,7 +77,6 @@
|
|||
<artifactId>mapper</artifactId>
|
||||
<version>4.0.2</version>
|
||||
</dependency>
|
||||
|
||||
<!-- mysql -->
|
||||
<dependency>
|
||||
<groupId>com.mysql</groupId>
|
||||
|
|
@ -115,8 +114,16 @@
|
|||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>5.1.5</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
<version>5.8.18</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcpkix-jdk15on</artifactId>
|
||||
<version>1.64</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public class GenEntity {
|
|||
private static boolean f_sql = false; // 是否需要导入包java.sql.*
|
||||
|
||||
/*** 数据库连接常量,需优化.每次运行main方法创建连接CPU损耗率高; **/
|
||||
private static final String URL = "jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true";
|
||||
private static final String URL = "jdbc:mysql://127.0.0.1:3306/add_database?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true";
|
||||
private static final String NAME = "root";
|
||||
private static final String PASS = "bonus@admin123";
|
||||
private static final String DRIVER = "com.mysql.cj.jdbc.Driver";
|
||||
|
|
@ -41,7 +41,7 @@ public class GenEntity {
|
|||
try {
|
||||
Class.forName(DRIVER);
|
||||
conn = DriverManager.getConnection(URL, NAME, PASS);
|
||||
conn.setCatalog("xxl_job");
|
||||
conn.setCatalog("add_database");
|
||||
} catch (Exception e1) {
|
||||
e1.printStackTrace();
|
||||
}
|
||||
|
|
@ -65,7 +65,7 @@ public class GenEntity {
|
|||
//获取数据库的元数据
|
||||
DatabaseMetaData db = getConnection().getMetaData();
|
||||
//从元数据中获取到所有的表名
|
||||
rs = db.getTables("xxl_job",null, null, new String[] { "TABLE" });
|
||||
rs = db.getTables("add_database",null, null, new String[] { "TABLE" });
|
||||
while(rs.next()) {
|
||||
tableNames.add(rs.getString(3));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,118 +8,128 @@ public class GlobalConfig {
|
|||
|
||||
|
||||
//申请接入时分配的 ebuild2AppId
|
||||
public static String ebuild2AppId = "test123456";
|
||||
public static String ebuild2AppId = "AQZLZHJCZX";
|
||||
//申请接入时分配的 sm2PubKey
|
||||
public static String sm2PubKey = "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEvQUHya/PBPjPxghiriEs9FtQahD6qum3dhVpoRn77R41YWnuz836DMT0TRp/okEE7wrwdoBxuh+kJgsqhrpuAQ==";
|
||||
public static String sm2PubKey = "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEwZ5qrV8eoXAIrjIMS8OVxdZW9ygBWfgURbu1vJ/czlzH+9fFxw5JA8gW5y5U/No2tyUg98K/8WdXXnrdZTz7iA==";
|
||||
//申请接入时分配的 sm2PriKey
|
||||
public static String sm2PriKey = "MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgtOD0Gbtv0xDguO1S+dGy4hJdcKKNO0uOr7LUBN3CACKgCgYIKoEcz1UBgi2hRANCAAQ1Dm8pwXMcXmoH7kFyU4kwgI9D00tTQtK0ZKk0W6JtC33Q6EejzBXbpguXXTcpskHEwEsuCZQkJqJ4ap1FHeXV";
|
||||
public static String sm2PriKey = "MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgfXc09NVNM4oSaNDQ4oGjaQ1juByLOrzh1Dy5gAimDXygCgYIKoEcz1UBgi2hRANCAAQN5FU5sG7d2wUF1fuBJ6N+7SK1bDIIk/QCRL14qwRNjsptDiQXzzjsqYwErFt/Yf/kMjxUoh7c3m6AQ6hWRzpZ";
|
||||
//申请接入时分配的 token
|
||||
public static String token = "e4652ff6d587c2cfda30523c1fcc62ab";
|
||||
public final static String IP_URL="httP://127.0.0.1:9090";
|
||||
|
||||
public static String token = "da421743404b6dd10fd7821ed1005662";
|
||||
public final static String IP_URL="https://dcp.sgcc.com.cn";
|
||||
public final static String TEST_URL=IP_URL+"/biz-api/ifsct/up/sel/testInterface";
|
||||
|
||||
|
||||
/**
|
||||
* 电网基建项目
|
||||
*/
|
||||
public final static String DW_JJ_XM_URL=IP_URL+"/biz-api/ifsct/up/sel/getPrjDwGridConstructionProject";
|
||||
|
||||
public final static String DW_JJ_XM_URL=IP_URL+"/biz-api/ifsct/up/sel/prjDwGridConstructionProject";
|
||||
/**
|
||||
* 单项工程
|
||||
*/
|
||||
public final static String DX_PRO_URL=IP_URL+"/biz-api/ifsct/up/sel/getPrjDwSingleProject";
|
||||
public final static String DX_PRO_URL=IP_URL+"/biz-api/ifsct/up/sel/prjDwSingleProject";
|
||||
/**
|
||||
* 标段-工程
|
||||
*/
|
||||
public final static String BD_PRO_URL=IP_URL+"/biz-api/ifsct/up/sel/getPrjBiddingSection";
|
||||
public final static String BD_PRO_URL=IP_URL+"/biz-api/ifsct/up/sel/prjBiddingSection";
|
||||
/**
|
||||
* 站班会信息
|
||||
*/
|
||||
public final static String ZBH_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmDwToolBoxTalk";
|
||||
|
||||
|
||||
public final static String ZBH_URL=IP_URL+"/biz-api/ifsct/up/sel/smDwToolBoxTalk";
|
||||
/**
|
||||
* 站班会人员
|
||||
*/
|
||||
public final static String ZBH_PEO_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmToolBoxTalkDesMember";
|
||||
|
||||
public final static String ZBH_PEO_URL=IP_URL+"/biz-api/ifsct/up/sel/smToolBoxTalkDesMember";
|
||||
/**
|
||||
* 到岗到位人员
|
||||
*/
|
||||
public final static String DGDW_USER_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmOndutyRecord";
|
||||
|
||||
public final static String DGDW_USER_URL=IP_URL+"/biz-api/ifsct/up/sel/smOndutyRecord";
|
||||
/**
|
||||
* 风险、作业票、站班会扩展信息
|
||||
*/
|
||||
public final static String DETAILS_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmDwDataStandardExt";
|
||||
|
||||
public final static String DETAILS_URL=IP_URL+"/biz-api/ifsct/up/sel/smDwDataStandardExt";
|
||||
/**
|
||||
* 施工作业票
|
||||
*/
|
||||
public final static String SG_TICKET_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmConstructionWorkTicket";
|
||||
|
||||
public final static String SG_TICKET_URL=IP_URL+"/biz-api/ifsct/up/sel/smConstructionWorkTicket";
|
||||
/**
|
||||
* 风险底数一本账
|
||||
*/
|
||||
public final static String RISK_DS_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmDwRiskPrecaution";
|
||||
|
||||
public final static String RISK_DS_URL=IP_URL+"/biz-api/ifsct/up/sel/smDwRiskPrecaution";
|
||||
/**
|
||||
* 施工作业票人员
|
||||
*/
|
||||
public final static String TICKET_USER_URL=IP_URL+"/biz-api/ifsct/up/sel/smTicketDesMember";
|
||||
|
||||
/**
|
||||
* 施工作业任务_周
|
||||
*/
|
||||
public final static String SG_WEEK_URL=IP_URL+"/biz-api/ifsct/up/sel/smDwConstructionTaskDesWeekly";
|
||||
|
||||
/**
|
||||
* 施工作业计划_日
|
||||
*/
|
||||
public final static String SG_DAY_URL=IP_URL+"/biz-api/ifsct/up/sel/smDwConstructionTaskDesDaily";
|
||||
|
||||
/**
|
||||
* 班组
|
||||
*
|
||||
*/
|
||||
public final static String WORK_TEAM_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmDwWorkingTeam";
|
||||
public final static String WORK_TEAM_URL=IP_URL+"/biz-api/ifsct/up/sel/smDwWorkingTeam";
|
||||
/**
|
||||
* 安全-班组成员信息
|
||||
*
|
||||
*/
|
||||
public final static String TEAM_USER_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmWorkingTeamMember";
|
||||
|
||||
public final static String TEAM_USER_URL=IP_URL+"/biz-api/ifsct/up/sel/smWorkingTeamMember";
|
||||
/**
|
||||
* 杆塔
|
||||
*/
|
||||
public final static String SG_GT_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmTowerSafety";
|
||||
|
||||
public final static String SG_GT_URL=IP_URL+"/biz-api/ifsct/up/sel/smTowerSafety";
|
||||
/**
|
||||
* 基建单位
|
||||
*/
|
||||
public final static String JJ_DW_URL=IP_URL+"/biz-api/ifsct/up/sel/getBaseSgcUnit";
|
||||
public final static String JJ_DW_URL=IP_URL+"/biz-api/ifsct/up/sel/baseSgcUnit";
|
||||
/**
|
||||
* 安全人员信息
|
||||
*/
|
||||
public final static String AQ_ZR_USER_URL=IP_URL+"/biz-api/ifsct/up/sel/getSmSafetyPersonnel";
|
||||
|
||||
public final static String AQ_ZR_USER_URL=IP_URL+"/biz-api/ifsct/up/sel/smSafetyPersonnel";
|
||||
/**
|
||||
* 基建布控球
|
||||
*/
|
||||
public static final String JJ_BALL_URL = IP_URL+"/biz-api/ifsct/up/sel/getSmCamera";
|
||||
|
||||
public static final String JJ_BALL_URL = IP_URL+"/biz-api/ifsct/up/sel/smCamera";
|
||||
/**
|
||||
* 标段安全 -信息
|
||||
*/
|
||||
public static final String JJ_BID_INFO_URL = IP_URL+"/biz-api/ifsct/up/sel/getSmBiddingSectionSafetyInfo";
|
||||
public static final String JJ_BID_INFO_URL = IP_URL+"/biz-api/ifsct/up/sel/smBiddingSectionSafetyInfo";
|
||||
/**
|
||||
* 单项工程-安全
|
||||
*/
|
||||
public static final String JJ_SING_PRO_AQ = IP_URL+"/biz-api/ifsct/up/sel/smSingleProjectSafetyInfo";
|
||||
/**
|
||||
* 工程履历
|
||||
*/
|
||||
public static final String JJ_GC_LL_URL = IP_URL+"/biz-api/ifsct/up/sel/getPrjEnginneringExperience";
|
||||
public static final String JJ_GC_LL_URL = IP_URL+"/biz-api/ifsct/up/sel/prjEnginneringExperience";
|
||||
/**
|
||||
* 项目部
|
||||
*/
|
||||
public static final String JJ_XMB_URL = IP_URL+"/biz-api/ifsct/up/sel/prjDwDeptGcprojectRela";
|
||||
/**
|
||||
*固有风险清册
|
||||
*/
|
||||
public static final String JJ_GD_RISK = IP_URL+"/biz-api/ifsct/up/sel/smInherentRiskList";
|
||||
/**
|
||||
*工法
|
||||
*/
|
||||
public static final String JJ_GF = IP_URL+"/biz-api/ifsct/up/sel/smConstructionMeth";
|
||||
/**
|
||||
* 电力井
|
||||
*/
|
||||
public static final String JJ_DLJ= IP_URL+"/biz-api/ifsct/up/sel/pmWellSafety";
|
||||
/**
|
||||
* 区段
|
||||
*/
|
||||
public static final String JJ_QD= IP_URL+"/biz-api/ifsct/up/sel/pmSection";
|
||||
|
||||
/**
|
||||
* 工程履历
|
||||
* 变电
|
||||
*/
|
||||
public static final String JJ_XMB_URL = IP_URL+"/biz-api/ifsct/up/sel/getPrjDwDeptGcprojectRela";
|
||||
public static final String JJ_BD= IP_URL+"/biz-api/ifsct/up/sel/pmSubstation";
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 变电 实体类
|
||||
* 2024-06-12 16:10:41 zijixiangba
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class JjBd{
|
||||
|
||||
private String id; //主键
|
||||
|
||||
private String sinPrjCode; //单项工程编码
|
||||
|
||||
private String bidSectCode; //标段工程编码
|
||||
|
||||
private String workSiteName; //部位名称；
|
||||
|
||||
private String longitude; //经度
|
||||
|
||||
private String latitude; //维度；
|
||||
|
||||
private String eastCoordinate; //东坐标；
|
||||
|
||||
private String northCoordinate; //北坐标；
|
||||
|
||||
private String address; //地理位置
|
||||
|
||||
private String provinceCode; //省公司编码
|
||||
|
||||
private String createrId; //创建人；
|
||||
|
||||
private String createTime; //创建时间；
|
||||
|
||||
private String updateTime; //更新时间
|
||||
|
||||
private String updaterId; //更新人
|
||||
|
||||
private String deleteFlag; //删除状态；默认0，包括：0未删除，1已删除
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 标段工程
|
||||
*/
|
||||
@Data
|
||||
public class JjBiddingProject{
|
||||
|
||||
private String id; //主键
|
||||
|
||||
private String constrTransformerCapacity; //建设变电容量；
|
||||
private String lineQuantity; //线路条数；
|
||||
private String mainTransformerQuantity; //主变台数；
|
||||
private String status; //状态；0：未提交；1：已提交
|
||||
private String constructionStatus; //在建状态；默认0：0：施工；1：暂停；
|
||||
private String subFlag; //是否有二级建管单位标识
|
||||
private String planStartDate; //计划开工时间
|
||||
private String actualStartDate; //实际开工时间
|
||||
private String planFinDate; //计划投产时间
|
||||
private String actualFinDate; //实际投产时间
|
||||
private String prjCode; //项目编码；
|
||||
private String planComplDate; //计划竣工时间
|
||||
private String actualComplDate; //实际竣工时间
|
||||
private String deleteFlag; //删除状态；默认 0；0：未删除；1：已删除
|
||||
private String createrId; //创建人；
|
||||
private String createTime; //创建时间；
|
||||
private String updaterId; //修改人；
|
||||
private String updateTime; //修改时间
|
||||
private String createType; //数据来源；2) 0：自动创建；1：手动创建；
|
||||
private String singleProjectCode; //单项工程编码
|
||||
private String biddingSectionCode; //标段编码；
|
||||
private String biddingSectionName; //标段名称
|
||||
private String provinceCode; //省公司编码；
|
||||
private String buildUnitCode; //建设管理单位编码；
|
||||
private String biddingSectionType; //标段类型；
|
||||
private String constructionLineLength; //建设线路长度；
|
||||
}
|
||||
|
||||
|
|
@ -2,8 +2,6 @@ package com.xxl.job.executor.inter.entity;
|
|||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @author：cwchen
|
||||
* @date：2024-05-08-11:26
|
||||
|
|
@ -12,6 +10,11 @@ import java.util.Date;
|
|||
*/
|
||||
@Data
|
||||
public class JjClassMeetting {
|
||||
|
||||
public static void main(String[] args) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
|
||||
Class.forName("org.gjt.mm.mysql.Driver").newInstance();
|
||||
String url ="jdbc:mysql://localhost/myDB?user=soft&password=soft1234&useUnicode=true&characterEncoding=8859_1";
|
||||
}
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 站班会
|
||||
*/
|
||||
@Data
|
||||
public class JjClassMeettingInfo {
|
||||
|
||||
private String id;
|
||||
|
||||
private String teamId;
|
||||
|
||||
private String teamName;
|
||||
|
||||
private String workManage;
|
||||
|
||||
private String workManagePhone;
|
||||
|
||||
private String workManageNum;
|
||||
|
||||
private String ticketId;
|
||||
/**
|
||||
* 作业工序
|
||||
*/
|
||||
private String workGx;
|
||||
/**
|
||||
* 作业类型
|
||||
*/
|
||||
private String workType;
|
||||
/**
|
||||
* 工作内容
|
||||
*/
|
||||
private String workContent;
|
||||
/**
|
||||
* 主要风险
|
||||
*/
|
||||
private String mainRisk;
|
||||
/**
|
||||
* 风险id
|
||||
*/
|
||||
private String riskId;
|
||||
|
||||
private String workSite;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 电力井
|
||||
*/
|
||||
@Data
|
||||
public class JjDlj{
|
||||
|
||||
private String id; //主键
|
||||
|
||||
private String singleProjectCode; //单项工程编码
|
||||
|
||||
private String biddingSectionCode; //标段编号
|
||||
|
||||
private String wellNo; //井号
|
||||
|
||||
private String wellType; //工井类型；0直线工井1转角工井、2三通工井、3四通工井、4接头工井
|
||||
|
||||
private String longitude; //经度；
|
||||
|
||||
private String latitude; //纬度；
|
||||
|
||||
private String eastCoordinate; //东坐标；
|
||||
|
||||
private String northCoordinate; //北坐标；
|
||||
|
||||
private String wellDepth; //井深；
|
||||
|
||||
private String size; //尺寸；
|
||||
|
||||
private String cover4gFlag; //4G信号是否覆盖；1是、0否。
|
||||
|
||||
private String createrId; //创建人；
|
||||
|
||||
private String createTime; //创建时间；
|
||||
|
||||
private String updaterId; //更新人；
|
||||
|
||||
private String updateTime; //更新时间；
|
||||
|
||||
private String deleteFlag; //删除状态；
|
||||
|
||||
private String provinceCode; //省公司编码
|
||||
|
||||
private String designChangeNo; //设计变更编号
|
||||
|
||||
private String address; //详细地址
|
||||
|
||||
private String upstreamTowerNo; //上行号。（上行井号或者上行塔号）
|
||||
|
||||
private String customFlag; //自定义标识
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* jjGf 实体类
|
||||
* 2024-06-12 16:10:41 zijixiangba
|
||||
*/
|
||||
|
||||
|
||||
@Data
|
||||
public class JjGf{
|
||||
|
||||
private String id; //主键id；
|
||||
|
||||
private String riskNo; //风险编号；
|
||||
|
||||
private String constructionMethodName; //工法名称
|
||||
|
||||
private String huvFlag; //0:常规工程 1:特高压
|
||||
|
||||
private String provinceCode; //省公司编码；
|
||||
|
||||
private String deleteFlag; //删除状态；默认0，包括：0未删除，1已删除
|
||||
|
||||
private String createrId; //创建人；
|
||||
|
||||
private String createTime; //创建时间；
|
||||
|
||||
private String updaterId; //更新人；
|
||||
|
||||
private String updateTime; //更新时间；
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1,8 +1,6 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
/**
|
||||
* @author：cwchen
|
||||
* @date：2024-05-08-11:26
|
||||
|
|
@ -11,6 +9,7 @@ import java.util.Date;
|
|||
*/
|
||||
@Data
|
||||
public class JjGt{
|
||||
|
||||
private String id; //主键
|
||||
private String topography; //地形地貌；
|
||||
private String stentFlag; //是否架构；1是、0否
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
/**
|
||||
* 作业票扩展信息
|
||||
* @author：cwchen
|
||||
* @date：2024-05-08-11:26
|
||||
* @version：1.0
|
||||
|
|
@ -11,21 +10,38 @@ import java.util.Date;
|
|||
*/
|
||||
@Data
|
||||
public class JjInfo {
|
||||
|
||||
|
||||
private String id; //
|
||||
private String replenishContent1; //补充内容
|
||||
private String replenishContent2; //补充内容
|
||||
//补充内容
|
||||
private String replenishContent1;
|
||||
//补充内容
|
||||
private String replenishContent2;
|
||||
|
||||
private String replenishContent3; //补充内容
|
||||
|
||||
private String replenishContent4; //补充内容
|
||||
|
||||
private String replenishContent5; //补充内容
|
||||
|
||||
private String replenishContent6; //补充内容
|
||||
|
||||
private String replenishContent7; //补充内容
|
||||
|
||||
private String deleteFlag; //删除状态；默认0，包括：0未删除，1已删除
|
||||
|
||||
private String createTime; //
|
||||
|
||||
private String updateTime; //
|
||||
|
||||
private String refId; //外键id；
|
||||
|
||||
private String refId2; //外键id；
|
||||
|
||||
private String sortNo; //排序号
|
||||
|
||||
private String extType; //扩展类型：10：风险预控措施,20：施工作业票_预控措施30：预控措施_站班会40：施工作业票_扩展信息50：风险底数一本账_扩展信息 60：站班会_扩展信息 70：站班会_拆分扩展信息
|
||||
|
||||
private String contentType; //ext_type 10：预控措施类型；包括：01-风险库；02-风险清册；03-风险底数一本账；04-一览表 20：预控措施 30：预控措施 40：内容类型；包括：01-变化情况；02-情况控制措施；03-主要风险 50：内容类型；包括：01-备注；02-风险可能导致后果；03-风险控制关键因素；04-作业部位名称；05-一览表作业部位名称 60：当日控制措施 70：内容类型；包括：01-备注；02-现场风险复测变化情况及补充措施；03-风险异常原因；04-补充安全控制措施
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 区段 实体类
|
||||
* 2024-06-12 16:10:41 zijixiangba
|
||||
*/
|
||||
|
||||
|
||||
@Data
|
||||
public class JjQd{
|
||||
private String id; //主键
|
||||
private String biddingSectionCode; //标段编码
|
||||
private String sectionNo; //区段编号；
|
||||
private String sectionName; //区段名称；
|
||||
private String startNo; //起始塔号；
|
||||
private String terminalNo; //终点塔号；
|
||||
private String sectionLength; //区段长度；
|
||||
private String totalTower; //杆塔总数(基)；
|
||||
private String totalTensTower; //耐张塔数(基)
|
||||
private String createrId; //创建人；
|
||||
private String createTime; //创建时间；
|
||||
private String updaterId; //更新人
|
||||
private String updateTime; //更新时间
|
||||
private String deleteFlag; //删除状态；
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 基建风险清册 实体类
|
||||
* 2024-06-12 16:10:41 zijixiangba
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class JjRisk{
|
||||
private String id; //主键
|
||||
private String riskNo; //风险编号；
|
||||
private String professional; //工程类型
|
||||
private String partSubentry; //分部分项
|
||||
private String workType; //作业类型
|
||||
private String workProcedure; //工序；
|
||||
private String riskLeve; //风险等级；包括：2；3；4；5
|
||||
private String minConstrHeadcount; //最少施工人数
|
||||
private String riskAssessmentValue; //风险评估值(D)
|
||||
private String consequenceDueToRisk; //风险可能导致后果；
|
||||
private String riskControlKeyFactor; //风险控制关键因素
|
||||
private String merge; //合并作业分组；
|
||||
private String remark; //备注；
|
||||
private String huvFlag; //0:常规工程 1:特高压
|
||||
private String provinceCode; //省公司编码；
|
||||
private String createrId; //创建人；
|
||||
private String createTime; //创建时间
|
||||
private String updaterId; //创建人
|
||||
private String updateTime; //更新时间
|
||||
private String deleteFlag; //删除状态；默认0，包括：0未删除，1已删除
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1,8 +1,6 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
/**
|
||||
* @author：cwchen
|
||||
* @date：2024-05-08-11:26
|
||||
|
|
@ -12,40 +10,75 @@ import java.util.Date;
|
|||
|
||||
@Data
|
||||
public class JjRiskPrecaution{
|
||||
|
||||
private String id; //主键ID
|
||||
|
||||
private String partSubentry; //分部分项
|
||||
|
||||
private String workType; //作业类型
|
||||
|
||||
private String workProcedure; //工序
|
||||
|
||||
private String assessmentRiskLevel; //初勘风险等级
|
||||
|
||||
private String reAssessmentRiskLevel; //复测风险等级
|
||||
|
||||
private String minConstrHeadcount; //最少施工人数
|
||||
|
||||
private String riskAssessmentValue; //风险评估值(D)
|
||||
|
||||
private String workContent; //作业内容
|
||||
|
||||
private String workingCondition; //8+2工况
|
||||
|
||||
private String voltageDrpFlag; //是否压降
|
||||
|
||||
private String sourceRiskPrecautionId; //风险底数一本账源头id
|
||||
|
||||
private String merge; //合并作业分组
|
||||
|
||||
private String riskStatus; //风险状态；包括：01-待执行，02-执行中，03-已完成，04-已销号
|
||||
|
||||
private String publishState; //发布状态 01 待提交 02 已发布
|
||||
|
||||
private String plannedStartDate; //计划开始时间
|
||||
|
||||
private String executeTime; //执行时间
|
||||
|
||||
private String endTime; //结束时间
|
||||
|
||||
private String huvFlag; //0:常规工程 1:特高压
|
||||
|
||||
private String buildUnitCode; //建设管理单位编码；
|
||||
|
||||
private String provinceCode; //省公司编码
|
||||
|
||||
private String createrId; //创建人
|
||||
|
||||
private String riskNo; //风险编号
|
||||
|
||||
private String createTime; //创建时间
|
||||
|
||||
private String updaterId; //更新人
|
||||
|
||||
private String updateTime; //更新时间
|
||||
|
||||
private String deleteFlag; //删除状态；默认0，包括：0未删除，1已删除
|
||||
private String workingConditionFlag; //是否8+2工况，默认0；包括：0否，1是
|
||||
|
||||
private String workingConditionFlag; //是否8+2工况，默认0；包括：0否，1是
|
||||
|
||||
private String constrMethId; //工法ID；工法ID，字符串拼接，使用“,”隔开单项工程编码
|
||||
|
||||
private String singleProjectCode; //单项工程编码
|
||||
|
||||
private String biddingSectionCode; //标段编码
|
||||
|
||||
private String workSiteId; //作业部位id
|
||||
|
||||
private String workSiteName; //作业部位名称
|
||||
|
||||
private String workSiteType; //作业部位类型；1-变电，2-电力井，3-杆塔，4-区段
|
||||
|
||||
private String professional; //工程类型
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* jjSingleInfo 实体类
|
||||
* 2024-06-12 16:10:41 zijixiangba
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class JjSingleInfo{
|
||||
|
||||
private String id; //主键
|
||||
|
||||
private String singleProjectId; //单项工程id
|
||||
|
||||
private String singleProjectName; //单项工程名称
|
||||
|
||||
private String singleProjectCode; //单项工程编码
|
||||
|
||||
private String safetyCode; //安全编码
|
||||
|
||||
private String safetyProjectStatus; //安全工程状态；包括:01-待建; 02-在施;03-停工;04-投产
|
||||
|
||||
private String prjLocal; //项目地址
|
||||
|
||||
private String provinceCode; //省公司编码
|
||||
|
||||
private String buildUnitCode; //建设管理单位编码；
|
||||
|
||||
private String buildUnitConPerson; //建设管理人名
|
||||
|
||||
private String buildUnitMobil; //建设管理单位联系人电话；
|
||||
|
||||
private String acrossArea; //流经区域
|
||||
|
||||
private String towerNo; //线路基础数（基）；
|
||||
|
||||
private String actualCommencementDate; //安全实际开工时间
|
||||
|
||||
private String actualFinishTime; //安全实际完工时间；
|
||||
private String currentDrpRate; //当前压降率
|
||||
private String currentWorkStage; //当前作业阶段
|
||||
private String towerFoundComNum; //工程基础完工数（基）
|
||||
private String towerAssemNum; //工程组塔完工数（基）；
|
||||
private String lineComNum; //架线完成数（km）；
|
||||
private String remark; //备注
|
||||
private String lastSuspendTime; //最近停工时间
|
||||
private String lastResumeTime; //最近复工时间
|
||||
private String huvFlag; //0:常规工程 1:特高压
|
||||
private String createrId; //创建人；
|
||||
private String createTime; //创建时间；
|
||||
private String updaterId; //更新人；
|
||||
private String updateTime; //更新时间；
|
||||
private String deleteFlag; //删除状态；默认0，包括：0未删除，1已删除
|
||||
private String prjType; //工程类型 0 - 变电 1- 线路
|
||||
private String singleProjectType; //单项工程类型
|
||||
private String prjCode; //项目编码
|
||||
private String prjName; //项目名称
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -3,6 +3,9 @@ package com.xxl.job.executor.inter.entity;
|
|||
import com.alibaba.fastjson.annotation.JSONField;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 基建班组
|
||||
*/
|
||||
@Data
|
||||
public class JjTeam {
|
||||
|
||||
|
|
@ -38,4 +41,6 @@ public class JjTeam {
|
|||
private String singleProjectCode; //单项工程编码
|
||||
|
||||
private String biddingSectionCode; //标段工程编码
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
package com.xxl.job.executor.inter.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class WorkDetailsVo {
|
||||
|
||||
private String workSite;
|
||||
|
||||
private String content;
|
||||
|
||||
private String workGx;
|
||||
|
||||
private String workType;
|
||||
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package com.xxl.job.executor.inter.mapper;
|
||||
|
||||
import com.xxl.job.executor.inter.entity.*;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ import java.util.List;
|
|||
* 数据接口数据层
|
||||
* @author 黑子
|
||||
*/
|
||||
@Repository
|
||||
@Mapper
|
||||
public interface InterMapper {
|
||||
|
||||
/**
|
||||
|
|
@ -24,7 +24,11 @@ public interface InterMapper {
|
|||
* @param list
|
||||
*/
|
||||
void insertBidPro(List<BidProject> list);
|
||||
|
||||
/**
|
||||
* 处理标段工程
|
||||
* @param list
|
||||
*/
|
||||
void insertBidProNew(List<JjBiddingProject> list);
|
||||
/**
|
||||
* 插入 班组team
|
||||
* @param list
|
||||
|
|
@ -163,4 +167,85 @@ public interface InterMapper {
|
|||
* @date 2024/5/8 15:56
|
||||
*/
|
||||
void insertDeptGcProjectData(List<JjDeptGcProject> list);
|
||||
|
||||
/**
|
||||
* 开始时间
|
||||
* @param startTime
|
||||
* @param endTime
|
||||
* @return
|
||||
*/
|
||||
List<JjRiskPrecaution> getJjRiskPrecautionList(@Param("startTime") String startTime, @Param("endTime") String endTime);
|
||||
|
||||
/**
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
List<JjClassMeettingInfo> getClassMettingList(@Param("startTime") String startTime, @Param("endTime") String endTime);
|
||||
|
||||
List<WorkDetailsVo> getWorkDetails(@Param("list") List<String> list);
|
||||
|
||||
String getMainRisk(@Param("ticketId") String ticketId);
|
||||
|
||||
/**
|
||||
*
|
||||
* @param vo
|
||||
*/
|
||||
void insertDataInfo(JjClassMeettingInfo vo);
|
||||
|
||||
void insertTeamInfo(JjTeam vo);
|
||||
|
||||
/**
|
||||
* 查询数据是否存在
|
||||
* @param vo
|
||||
* @return
|
||||
*/
|
||||
int getTeamInfoNum(JjTeam vo);
|
||||
|
||||
List<JjTicket> getSmConstructionWorkTicketList(@Param("startTime")String startTime, @Param("endTime")String endTime);
|
||||
|
||||
List<JjClassMeetting> getClassMettingIds(@Param("startTime")String startTime,@Param("endTime") String endTime);
|
||||
|
||||
/**
|
||||
* 查询扩展信息
|
||||
* @param startTime
|
||||
* @param endTime
|
||||
* @return
|
||||
*/
|
||||
List<JjInfo> getJjinfoList(@Param("startTime")String startTime, @Param("endTime")String endTime);
|
||||
|
||||
/**'
|
||||
* 查询数据
|
||||
* @param list
|
||||
*/
|
||||
void insertJJRisk(List<JjRisk> list);
|
||||
|
||||
/**
|
||||
* 单项工程
|
||||
* @param list
|
||||
*/
|
||||
void insertSignInfoPro(List<JjSingleInfo> list);
|
||||
|
||||
/**
|
||||
* 工法
|
||||
* @param list
|
||||
*/
|
||||
void insertGfData(List<JjGf> list);
|
||||
|
||||
/**
|
||||
* 插入电力井数据
|
||||
* @param list
|
||||
*/
|
||||
void insertDljData(List<JjDlj> list);
|
||||
|
||||
/**
|
||||
* 插入区段数据
|
||||
* @param list
|
||||
*/
|
||||
void insertQdData(List<JjQd> list);
|
||||
|
||||
/**
|
||||
* 插入变电数据
|
||||
* @param list
|
||||
*/
|
||||
void insertJjBdData(List<JjBd> list);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ import com.xxl.job.core.context.XxlJobHelper;
|
|||
import com.xxl.job.executor.inter.entity.*;
|
||||
import com.xxl.job.executor.inter.mapper.InterMapper;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -17,7 +17,7 @@ import java.util.List;
|
|||
public class DataCenterService {
|
||||
|
||||
|
||||
@Autowired
|
||||
@Resource
|
||||
private InterMapper mapper;
|
||||
/**
|
||||
* 数据存储入库
|
||||
|
|
@ -46,6 +46,17 @@ public class DataCenterService {
|
|||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
public void insertBidProNew(List<JjBiddingProject> list) {
|
||||
try{
|
||||
mapper.insertBidProNew(list);
|
||||
}catch (Exception e){
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 班组信息自动花
|
||||
* @param list
|
||||
|
|
@ -53,6 +64,12 @@ public class DataCenterService {
|
|||
public void insertTeam(List<JjTeam> list) {
|
||||
try{
|
||||
mapper.insertTeam(list);
|
||||
list.forEach(vo->{
|
||||
int num=mapper.getTeamInfoNum(vo);
|
||||
if(num<1){
|
||||
mapper.insertTeamInfo(vo);
|
||||
}
|
||||
});
|
||||
}catch (Exception e){
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
|
|
@ -104,7 +121,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -114,7 +130,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -128,7 +143,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -142,7 +156,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -156,7 +169,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -170,7 +182,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -180,7 +191,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("站班会数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -190,7 +200,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("站班会人员数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -200,7 +209,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("单项工程数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -210,7 +218,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("到岗到位数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -220,7 +227,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("风险底数一本帐数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -230,7 +236,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("基建单位数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -240,7 +245,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("扩展数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -250,7 +254,6 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("杆塔数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -260,6 +263,163 @@ public class DataCenterService {
|
|||
}catch (Exception e){
|
||||
XxlJobHelper.log("项目部数据处理异常内容--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询数据
|
||||
* @param startTime
|
||||
* @param endTime
|
||||
* @return
|
||||
*/
|
||||
public List<JjRiskPrecaution> getJjRiskPrecautionList(String startTime, String endTime) {
|
||||
return mapper.getJjRiskPrecautionList(startTime,endTime);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询站班会信息
|
||||
* @return
|
||||
*/
|
||||
public List<JjClassMeettingInfo> getClassMettingList(String startTime, String endTime) {
|
||||
return mapper.getClassMettingList(startTime,endTime);
|
||||
}
|
||||
|
||||
/**
|
||||
* 数据详情
|
||||
* @param riskId
|
||||
* @return
|
||||
*/
|
||||
public List<WorkDetailsVo> getWorkDetails(List<String> riskId) {
|
||||
return mapper.getWorkDetails(riskId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 主要风险
|
||||
* @param ticketId
|
||||
* @return
|
||||
*/
|
||||
public String getMainRisk(String ticketId) {
|
||||
return mapper.getMainRisk(ticketId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 站班会 负载信息
|
||||
* @param vo
|
||||
*/
|
||||
public void insertDataInfo(JjClassMeettingInfo vo) {
|
||||
mapper.insertDataInfo(vo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询施工作业票的id
|
||||
* @param startTime
|
||||
* @param endTime
|
||||
* @return
|
||||
*/
|
||||
public List<JjTicket> getSmConstructionWorkTicketList(String startTime, String endTime) {
|
||||
return mapper.getSmConstructionWorkTicketList(startTime,endTime);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询站班会id
|
||||
* @param startTime
|
||||
* @param endTime
|
||||
* @return
|
||||
*/
|
||||
public List<JjClassMeetting> getClassMettingIds(String startTime, String endTime) {
|
||||
return mapper.getClassMettingIds(startTime,endTime);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询 站班会 扩展id
|
||||
* @param startTime
|
||||
* @param endTime
|
||||
* @return
|
||||
*/
|
||||
public List<JjInfo> getJjinfoList(String startTime, String endTime) {
|
||||
return mapper.getJjinfoList(startTime,endTime);
|
||||
}
|
||||
|
||||
/**
|
||||
* 基建固定风险清册异常
|
||||
* @param list
|
||||
*/
|
||||
public void insertJJRisk(List<JjRisk> list) {
|
||||
try{
|
||||
mapper.insertJJRisk(list);
|
||||
}catch (Exception e){
|
||||
XxlJobHelper.log("基建固定风险清册异常--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 插入单项工程
|
||||
* @param list
|
||||
*/
|
||||
public void insertSignInfoPro(List<JjSingleInfo> list) {
|
||||
try{
|
||||
mapper.insertSignInfoPro(list);
|
||||
}catch (Exception e){
|
||||
XxlJobHelper.log("安全单项工程--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 插入基建工法
|
||||
* @param list
|
||||
*/
|
||||
public void insertGfData(List<JjGf> list) {
|
||||
try{
|
||||
mapper.insertGfData(list);
|
||||
}catch (Exception e){
|
||||
XxlJobHelper.log("基建工程工法--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 插入电力井数据
|
||||
* @param list
|
||||
*/
|
||||
public void insertDljData(List<JjDlj> list) {
|
||||
try{
|
||||
mapper.insertDljData(list);
|
||||
}catch (Exception e){
|
||||
XxlJobHelper.log("电力井数据插入--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 插入区段数据
|
||||
* @param list
|
||||
*/
|
||||
public void insertQdData(List<JjQd> list) {
|
||||
try{
|
||||
mapper.insertQdData(list);
|
||||
}catch (Exception e){
|
||||
XxlJobHelper.log("区段数据插入--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 插入变电数据
|
||||
* @param list
|
||||
*/
|
||||
public void insertJjBdData(List<JjBd> list) {
|
||||
try{
|
||||
mapper.insertJjBdData(list);
|
||||
}catch (Exception e){
|
||||
XxlJobHelper.log("区段数据插入--->{}",e.toString());
|
||||
XxlJobHelper.handleFail(e.toString());
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,958 @@
|
|||
//package com.xxl.job.executor.inter.service;
|
||||
//
|
||||
//import cn.hutool.http.HttpResponse;
|
||||
//import com.alibaba.fastjson.JSONArray;
|
||||
//import com.alibaba.fastjson.JSONObject;
|
||||
//import com.xxl.job.core.context.XxlJobHelper;
|
||||
//import com.xxl.job.executor.inter.config.GlobalConfig;
|
||||
//import com.xxl.job.executor.inter.entity.*;
|
||||
//import com.xxl.job.executor.inter.utils.DataUtils;
|
||||
//import com.xxl.job.executor.inter.utils.PostUtils;
|
||||
//import com.xxl.job.executor.inter.utils.Sm4Utils;
|
||||
//import com.xxl.job.executor.inter.utils.StringHelper;
|
||||
//import io.netty.util.internal.StringUtil;
|
||||
//import lombok.extern.slf4j.Slf4j;
|
||||
//import org.springframework.beans.factory.annotation.Autowired;
|
||||
//import org.springframework.stereotype.Service;
|
||||
//
|
||||
//import java.util.Arrays;
|
||||
//import java.util.List;
|
||||
//import java.util.Map;
|
||||
//
|
||||
///**
|
||||
// * 业务工程管理
|
||||
// *
|
||||
// * @author 黑子
|
||||
// */
|
||||
//@Service
|
||||
//@Slf4j
|
||||
//public class InterServiceTest {
|
||||
//
|
||||
// @Autowired
|
||||
// private DataCenterService service;
|
||||
//
|
||||
// /**
|
||||
// * 分页默认条数
|
||||
// */
|
||||
// public Integer pageSize = 50;
|
||||
//
|
||||
// static boolean FY_BOOLEAN=true;
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * 查询项目实体类
|
||||
// */
|
||||
// public void getProInfo(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", "2024-01-01 00:00:00,2024-06-30 00:00:00");
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjProject> list = JSONArray.parseArray(array.toJSONString(), JjProject.class);
|
||||
// service.insertProData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getProInfo(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 标段工程
|
||||
// */
|
||||
// public void getBidPro(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", "2024-01-01 00:00:00,2024-06-30 00:00:00");
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.BD_PRO_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<BidProject> list = JSONArray.parseArray(array.toJSONString(), BidProject.class);
|
||||
// service.insertBidPro(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getBidPro(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 查询班组信息
|
||||
// */
|
||||
// public void getTeam(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
//
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("type", 21);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.WORK_TEAM_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjTeam> list = JSONArray.parseArray(array.toJSONString(), JjTeam.class);
|
||||
// service.insertTeam(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getTeam(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 班组人员接口
|
||||
// */
|
||||
// public void getTeamPeople(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("type", "22");
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.TEAM_USER_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjTeamPeople> list = JSONArray.parseArray(array.toJSONString(), JjTeamPeople.class);
|
||||
// //加密字段进行解密
|
||||
// list.forEach(vo->{
|
||||
// vo.setRealName(Sm4Utils.decode(vo.getRealName()));
|
||||
// vo.setIdCard(Sm4Utils.decode(vo.getIdCard()));
|
||||
// });
|
||||
//
|
||||
// service.insertTeamPeople(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getTeamPeople(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 作业票信息
|
||||
// */
|
||||
// public void getTicket(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.SG_TICKET_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjTicket> list = JSONArray.parseArray(array.toJSONString(), JjTicket.class);
|
||||
// service.insertTicket(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getTicket(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public void getTicketPeople(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("type", 24);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.TICKET_USER_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjTicketPeople> list = JSONArray.parseArray(array.toJSONString(), JjTicketPeople.class);
|
||||
// list.forEach(vo->{
|
||||
// vo.setMobile(Sm4Utils.decode(vo.getMobile()));
|
||||
// vo.setRealName(Sm4Utils.decode(vo.getRealName()));
|
||||
// vo.setIdCard(Sm4Utils.decode(vo.getIdCard()));
|
||||
// });
|
||||
//
|
||||
// service.insertTicketPeople(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getTicketPeople(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
// public void getWeeksPlan(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.SG_WEEK_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjWeeksPlan> list = JSONArray.parseArray(array.toJSONString(), JjWeeksPlan.class);
|
||||
// service.insertWeeksPlanData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getWeeksPlan(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
// public void getDayPlan(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.SG_DAY_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjDayPlan> list = JSONArray.parseArray(array.toJSONString(), JjDayPlan.class);
|
||||
// service.insertDayPlanData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getDayPlan(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 安全人员获取
|
||||
// */
|
||||
// public void getJJUser(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("type", "27");
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.AQ_ZR_USER_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjUser> list = JSONArray.parseArray(array.toJSONString(), JjUser.class);
|
||||
// list.forEach(vo->{
|
||||
// vo.setMobile(Sm4Utils.decode(vo.getMobile()));
|
||||
// vo.setRealName(Sm4Utils.decode(vo.getRealName()));
|
||||
// vo.setIdCard(Sm4Utils.decode(vo.getIdCard()));
|
||||
// });
|
||||
// service.insertJJUser(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getJJUser(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 布控球
|
||||
// */
|
||||
// public void getJJBall(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// obj.put("type", 28);
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.JJ_BALL_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjBall> list = JSONArray.parseArray(array.toJSONString(), JjBall.class);
|
||||
// service.insertJjBall(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getJJBall(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 标段安全信息
|
||||
// */
|
||||
// public void getJJBidInfo(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.JJ_BID_INFO_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjBidInfo> list = JSONArray.parseArray(array.toJSONString(), JjBidInfo.class);
|
||||
// service.insertJjBidInfo(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getJJBidInfo(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 获取工程履历信息
|
||||
// */
|
||||
// public void getGcLL(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.JJ_GC_LL_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjPrjEnginneringExperience> list = JSONArray.parseArray(array.toJSONString(), JjPrjEnginneringExperience.class);
|
||||
// service.insertGcLlData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getGcLL(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /*
|
||||
// * 站班会
|
||||
// * @return void
|
||||
// * @author cwchen
|
||||
// * @date 2024/5/8 9:49
|
||||
// */
|
||||
// public void getClassMeetingInfo(int pageNum) {
|
||||
// try {
|
||||
// //当前页
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("type", 9);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.ZBH_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjClassMeetting> list = JSONArray.parseArray(array.toJSONString(), JjClassMeetting.class);
|
||||
// list.forEach(vo->{
|
||||
// vo.setToolBoxTalkAddress(Sm4Utils.decode(vo.getToolBoxTalkAddress()));
|
||||
// vo.setToolBoxTalkLatitude(Sm4Utils.decode(vo.getToolBoxTalkLatitude()));
|
||||
// vo.setToolBoxTalkLongitude(Sm4Utils.decode(vo.getToolBoxTalkLongitude()));
|
||||
// });
|
||||
// service.insertClassMeetingData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getClassMeetingInfo(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /*
|
||||
// * 站班会人员
|
||||
// * @return void
|
||||
// * @author cwchen
|
||||
// * @date 2024/5/8 10:14
|
||||
// */
|
||||
// public void getClassMeetingPeopleInfo(int pageNum) {
|
||||
// try {
|
||||
// //当前页
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// obj.put("type", "10");
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.ZBH_PEO_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjClassMeetingPeople> list = JSONArray.parseArray(array.toJSONString(), JjClassMeetingPeople.class);
|
||||
// list.forEach(vo->{
|
||||
// vo.setRealName(Sm4Utils.decode(vo.getRealName()));
|
||||
// vo.setIdCard(Sm4Utils.decode(vo.getIdCard()));
|
||||
// });
|
||||
// service.insertClassMeetingPeopleData(list);
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getClassMeetingPeopleInfo(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 单项工程
|
||||
// *
|
||||
// * @return void
|
||||
// * @author cwchen
|
||||
// * @date 2024/5/8 13:48
|
||||
// */
|
||||
// public void getSingleProjectInfo(int pageNum) {
|
||||
// try {
|
||||
// //当前页
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", "2024-01-01 00:00:00,2024-06-30 00:00:00");
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DX_PRO_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjSingleProject> list = JSONArray.parseArray(array.toJSONString(), JjSingleProject.class);
|
||||
// service.insertSingleProjectData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getSingleProjectInfo(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 到岗到位
|
||||
// *
|
||||
// * @return void
|
||||
// * @author cwchen
|
||||
// * @date 2024/5/8 14:22
|
||||
// */
|
||||
// public void getOnDutyInfo(int pageNum) {
|
||||
// try {
|
||||
// //当前页
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("type", 4);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DGDW_USER_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjOnDuty> list = JSONArray.parseArray(array.toJSONString(), JjOnDuty.class);
|
||||
// list.forEach(vo->{
|
||||
// vo.setMobile(Sm4Utils.decode(vo.getMobile()));
|
||||
// vo.setRealName(Sm4Utils.decode(vo.getRealName()));
|
||||
// vo.setIdCard(Sm4Utils.decode(vo.getIdCard()));
|
||||
// });
|
||||
//
|
||||
// service.insertOnDutyData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getOnDutyInfo(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 风险底数一本帐
|
||||
// *
|
||||
// * @return void
|
||||
// * @author cwchen
|
||||
// * @date 2024/5/8 14:33
|
||||
// */
|
||||
// public void getRiskPrecautionInfo(int pageNum) {
|
||||
// try {
|
||||
// //当前页
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.RISK_DS_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjRiskPrecaution> list = JSONArray.parseArray(array.toJSONString(), JjRiskPrecaution.class);
|
||||
// service.insertRiskPrecautionData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getRiskPrecautionInfo(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 基建单位
|
||||
// *
|
||||
// * @return void
|
||||
// * @author cwchen
|
||||
// * @date 2024/5/8 14:48
|
||||
// */
|
||||
// public void getUnitInfo(int pageNum) {
|
||||
// try {
|
||||
// //当前页
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.JJ_DW_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjUnit> list = JSONArray.parseArray(array.toJSONString(), JjUnit.class);
|
||||
// service.insertUnitData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getUnitInfo(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * 杆塔
|
||||
// *
|
||||
// * @return void
|
||||
// * @author cwchen
|
||||
// * @date 2024/5/8 15:37
|
||||
// */
|
||||
// public void getGtInfo(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("type", 8);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.SG_GT_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjGt> list = JSONArray.parseArray(array.toJSONString(), JjGt.class);
|
||||
// list.forEach(vo->{
|
||||
// vo.setLatitude(Sm4Utils.decode(vo.getLatitude()));
|
||||
// vo.setLongitude(Sm4Utils.decode(vo.getLongitude()));
|
||||
// vo.setAddress(Sm4Utils.decode(vo.getAddress()));
|
||||
// });
|
||||
// service.insertGtData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getGtInfo(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * 项目部
|
||||
// * @return void
|
||||
// * @author cwchen
|
||||
// * @date 2024/5/8 15:55
|
||||
// */
|
||||
// public void getDeptGcProjectTest(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", "2024-01-01 00:00:00,2024-06-30 00:00:00");
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DW_JJ_XM_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjProject> list = JSONArray.parseArray(array.toJSONString(), JjProject.class);
|
||||
// service.insertProData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getDeptGcProjectTest(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 项目部
|
||||
// * @return void
|
||||
// * @author cwchen
|
||||
// * @date 2024/5/8 15:55
|
||||
// */
|
||||
// public void getDeptGcProject(int pageNum) {
|
||||
// try {
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", "2024-01-01 00:00:00,2024-06-30 00:00:00");
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.JJ_XMB_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjDeptGcProject> list = JSONArray.parseArray(array.toJSONString(), JjDeptGcProject.class);
|
||||
// service.insertDeptGcProjectData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getDeptGcProject(pageNum);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 风险底数一本账
|
||||
// * -分项预控措施一本账
|
||||
// * 风险预控措施
|
||||
// * 预控措施类型；包括：01-风险库；02-风险清册；03-风险底数一本账；04-一览表
|
||||
// * @param pageNum
|
||||
// */
|
||||
// public void getSmDwRiskPrecautionInfo(int pageNum) {
|
||||
// try {
|
||||
// List<JjRiskPrecaution> list=service.getJjRiskPrecautionList(DataUtils.getStartTime(),DataUtils.getEndTime());
|
||||
// for (JjRiskPrecaution vo:list) {
|
||||
// getInfo(pageNum,vo.getId(),"10");
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * 扩展信息-施工作业票_预控措施
|
||||
// * 施工作业票_预控措施
|
||||
// * 预控措施
|
||||
// * @param pageNum
|
||||
// */
|
||||
// public void getSmConstructionWorkTicketInfo(int pageNum) {
|
||||
// try {
|
||||
// List<JjTicket> list=service.getSmConstructionWorkTicketList(DataUtils.getStartTime(),DataUtils.getEndTime());
|
||||
// for (JjTicket vo:list) {
|
||||
// getInfo(pageNum,vo.getId(),"20");
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
// /**
|
||||
// * 扩展信息-预控措施_站班会
|
||||
// * 预控措施_站班会
|
||||
// * 预控措施
|
||||
// * @param pageNum
|
||||
// */
|
||||
// public void getSmDwToolBoxTalkInfo(int pageNum) {
|
||||
// try {
|
||||
// List<JjClassMeetting> list=service.getClassMettingIds(DataUtils.getStartTime(),DataUtils.getEndTime());
|
||||
//
|
||||
// for (JjClassMeetting vo:list) {
|
||||
// getInfo(pageNum,vo.getId(),"30");
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
// /**
|
||||
// * 扩展信息-施工作业票_扩展信息
|
||||
// * 施工作业票_扩展信息
|
||||
// * 内容类型；包括：01-变化情况；02-情况控制措施；03-主要风险
|
||||
// * ->同 外键id同 20 -作业票
|
||||
// * @param pageNum
|
||||
// */
|
||||
// public void getSmConstructionWorkTicketInfo2(int pageNum) {
|
||||
// try {
|
||||
// List<JjTicket> list=service.getSmConstructionWorkTicketList(DataUtils.getStartTime(),DataUtils.getEndTime());
|
||||
// for (JjTicket vo:list) {
|
||||
// getInfo(pageNum,vo.getId(),"40");
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 风险底数一本账_扩展信息
|
||||
// * 风险底数一本账_扩展信息
|
||||
// * 内容类型；包括：01-备注；02-风险可能导致后果；03-风险控制关键因素；04-作业部位名称；05-一览表作业部位名称
|
||||
// *
|
||||
// * id 同 10 ->风险一本账id
|
||||
// * @param pageNum
|
||||
// */
|
||||
// public void getSmDwRiskPrecautionInfo2(int pageNum) {
|
||||
// try {
|
||||
// List<JjRiskPrecaution> list=service.getJjRiskPrecautionList(DataUtils.getStartTime(),DataUtils.getEndTime());
|
||||
// for (JjRiskPrecaution vo:list) {
|
||||
// getInfo(pageNum,vo.getId(),"50");
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
// /**
|
||||
// * 站班会_扩展信息
|
||||
// * 当日控制措施
|
||||
// * 站班会的当日控制措施
|
||||
// * ->同作业票扩展信息
|
||||
// * ->同 30
|
||||
// * @param pageNum
|
||||
// */
|
||||
// public void getSmDwToolBoxTalkInfo2(int pageNum) {
|
||||
// try {
|
||||
// List<JjClassMeetting> list=service.getClassMettingIds(DataUtils.getStartTime(),DataUtils.getEndTime());
|
||||
// for (JjClassMeetting vo:list) {
|
||||
// getInfo(pageNum,vo.getId(),"60");
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 站班会_拆分扩展信息
|
||||
// * 当日控制措施
|
||||
// * 内容类型；包括：01-备注；02-现场风险复测变化情况及补充措施；03-风险异常原因；04-补充安全控制措施
|
||||
// * @param pageNum
|
||||
// */
|
||||
// public void getSmDwDataStandardExtInfo(int pageNum) {
|
||||
// try {
|
||||
// List<JjInfo> list=service.getJjinfoList(DataUtils.getStartTime(),DataUtils.getEndTime());
|
||||
// for (JjInfo vo:list) {
|
||||
// getInfo(pageNum,vo.getId(),"70");
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 查询扩展信息
|
||||
// */
|
||||
// public void getInfo(int pageNum,String refId,String extType){
|
||||
// try {
|
||||
// //当前页
|
||||
// JSONObject obj = new JSONObject();
|
||||
// obj.put("PAGE_NUM", pageNum);
|
||||
// //业务id
|
||||
// obj.put("REF_ID1",refId);
|
||||
// //业务类型
|
||||
// obj.put("EXT_TYPE",extType);
|
||||
// obj.put("PAGE_SIZE", pageSize);
|
||||
// obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
// HttpResponse httpResponse = PostUtils.sendData(obj.toString(), GlobalConfig.DETAILS_URL);
|
||||
// Map<String, Object> map = DataUtils.getArray(httpResponse);
|
||||
// JSONArray array = (JSONArray) map.get("array");
|
||||
// if (array != null) {
|
||||
// List<JjInfo> list = JSONArray.parseArray(array.toJSONString(), JjInfo.class);
|
||||
// service.insertInfoData(list);
|
||||
// pageNum++;
|
||||
// if (pageNum <= (Integer) map.get("TOTAL_PAGE")) {
|
||||
// if (FY_BOOLEAN){
|
||||
// getInfo(pageNum,refId,extType);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (Exception e) {
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 站班会的 扩展功能优化
|
||||
// * @param
|
||||
// */
|
||||
// public void getClassMettingInfo() {
|
||||
// try {
|
||||
// List<JjClassMeettingInfo> classList=service.getClassMettingList(DataUtils.getStartDay(),DataUtils.getEndDay());
|
||||
// classList.forEach(vo->{
|
||||
// WorkDetailsVo wvo=getMettingInfo(vo.getRiskId());
|
||||
// vo.setWorkType(wvo.getWorkType());
|
||||
// vo.setWorkGx(wvo.getWorkGx());
|
||||
// vo.setWorkContent(wvo.getContent());
|
||||
// vo.setWorkSite(wvo.getWorkSite());
|
||||
// String mainRisk=service.getMainRisk(vo.getTicketId());
|
||||
// vo.setMainRisk(mainRisk);
|
||||
// service.insertDataInfo(vo);
|
||||
// });
|
||||
//
|
||||
// }catch (Exception e){
|
||||
// XxlJobHelper.handleFail(e.toString());
|
||||
// log.error(e.toString(), e);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
// public WorkDetailsVo getMettingInfo(String riskProductId){
|
||||
// WorkDetailsVo workDetailsVo=new WorkDetailsVo();
|
||||
// try{
|
||||
// if (StringUtil.isNullOrEmpty(riskProductId)) {
|
||||
// return workDetailsVo;
|
||||
// }
|
||||
// List<String> riskId= Arrays.asList(riskProductId.split(","));
|
||||
// List<WorkDetailsVo> details=service.getWorkDetails(riskId);
|
||||
// StringBuffer workSite=new StringBuffer();
|
||||
// StringBuffer content=new StringBuffer();
|
||||
// StringBuffer workGx=new StringBuffer();
|
||||
// StringBuffer workType=new StringBuffer();
|
||||
// if(details!=null && details.size()>0){
|
||||
// details.forEach(vo->{
|
||||
// if(StringHelper.isNotEmpty(vo.getWorkSite())){
|
||||
// if(StringHelper.isNotEmpty(workSite.toString())){
|
||||
// workSite.append(";");
|
||||
// }
|
||||
// workSite.append(vo.getWorkSite());
|
||||
// }
|
||||
// if(StringHelper.isNotEmpty(vo.getContent())){
|
||||
// if(StringHelper.isNotEmpty(content.toString())){
|
||||
// content.append(";");
|
||||
// }
|
||||
// content.append(vo.getContent());
|
||||
// }
|
||||
// if(StringHelper.isNotEmpty(vo.getWorkGx())){
|
||||
// if(StringHelper.isNotEmpty(workGx.toString())){
|
||||
// workGx.append(";");
|
||||
// }
|
||||
// workGx.append(vo.getWorkGx());
|
||||
// }
|
||||
// if(StringHelper.isNotEmpty(vo.getWorkType())){
|
||||
// if(StringHelper.isNotEmpty(workType.toString())){
|
||||
// workType.append(";");
|
||||
// }
|
||||
// workType.append(vo.getWorkType());
|
||||
// }
|
||||
// });
|
||||
// workDetailsVo.setWorkType(workType.toString());
|
||||
// workDetailsVo.setWorkSite(workSite.toString());
|
||||
// workDetailsVo.setContent(content.toString());
|
||||
// workDetailsVo.setWorkGx(workGx.toString());
|
||||
// }
|
||||
// }catch (Exception e){
|
||||
// log.error(e.toString(),e);
|
||||
// }
|
||||
// return workDetailsVo;
|
||||
//
|
||||
// }
|
||||
//}
|
||||
//
|
||||
|
|
@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
|
|||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.xxl.job.core.context.XxlJobHelper;
|
||||
import com.xxl.job.core.util.DateUtil;
|
||||
import com.xxl.job.executor.inter.config.GlobalConfig;
|
||||
import io.netty.util.internal.StringUtil;
|
||||
|
||||
|
|
@ -13,6 +14,11 @@ import java.util.Map;
|
|||
|
||||
public class DataUtils {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public static Integer pageSize = 50;
|
||||
|
||||
public static Map<String, Object> getArray(HttpResponse httpResponse) {
|
||||
String data = PostUtils.ebuildDecrypt(httpResponse, GlobalConfig.sm2PriKey);
|
||||
if (!StringUtil.isNullOrEmpty(data)) {
|
||||
|
|
@ -21,15 +27,33 @@ public class DataUtils {
|
|||
if (success.equals("true")) {
|
||||
JSONObject data2 = (JSONObject) json.get("data");
|
||||
Map<String, Object> map = getPage(data2);
|
||||
String totalPage=map.get("TOTAL_PAGE").toString();
|
||||
if(StringHelper.isNotEmpty(totalPage)){
|
||||
Integer total=Integer.parseInt(totalPage);
|
||||
if(total<1){
|
||||
map.put("array", null);
|
||||
return map;
|
||||
}
|
||||
}
|
||||
JSONArray array = data2.getJSONArray("INFO");
|
||||
map.put("array", array);
|
||||
return map;
|
||||
} else {
|
||||
XxlJobHelper.handleFail(json.get("fail").toString());
|
||||
XxlJobHelper.handleFail(json.get("message").toString());
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public static JSONObject getJsonObject(int pageNum){
|
||||
JSONObject obj = new JSONObject();
|
||||
obj.put("PAGE_NUM", pageNum);
|
||||
obj.put("PAGE_SIZE", pageSize);
|
||||
obj.put("CREATE_TIME", DataUtils.getTimes());
|
||||
return obj;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页数据解析
|
||||
*
|
||||
|
|
@ -58,4 +82,67 @@ public class DataUtils {
|
|||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 开始时间-结束时间
|
||||
* @return
|
||||
*/
|
||||
public static String getTimes(){
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
if(StringUtil.isNullOrEmpty(param)){
|
||||
param=DateUtil.getNowDate();
|
||||
String nowTime=DateUtil.getNowTime();
|
||||
return param+" 00:00:00,"+nowTime;
|
||||
}else {
|
||||
String[] times=param.split(",");
|
||||
if(times.length>1){
|
||||
return times[0]+" 00:00:00,"+times[1]+" 59:59:59";
|
||||
}else {
|
||||
String nowTime=DateUtil.getNowTime();
|
||||
return times[0]+" 00:00:00,"+nowTime;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static String getStartTime(){
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
if(StringUtil.isNullOrEmpty(param)){
|
||||
param=DateUtil.getNowDate();
|
||||
}else {
|
||||
param=param.split(",")[0];
|
||||
}
|
||||
return param+" 00:00:00";
|
||||
}
|
||||
public static String getEndTime(){
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
if(!StringUtil.isNullOrEmpty(param)){
|
||||
String[] times=param.split(",");
|
||||
if(times.length>1){
|
||||
return times[2]+" 59:59:59";
|
||||
}
|
||||
}
|
||||
return DateUtil.getNowTime();
|
||||
}
|
||||
|
||||
public static String getStartDay(){
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
if(StringUtil.isNullOrEmpty(param)){
|
||||
param=DateUtil.getNowDate();
|
||||
}else {
|
||||
param=param.split(",")[0];
|
||||
}
|
||||
return param;
|
||||
}
|
||||
public static String getEndDay(){
|
||||
String param = XxlJobHelper.getJobParam();
|
||||
if(!StringUtil.isNullOrEmpty(param)){
|
||||
String[] times=param.split(",");
|
||||
if(times.length>1){
|
||||
return times[2];
|
||||
}
|
||||
}
|
||||
return DateUtil.getNowDate();
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,4 +53,6 @@ public class KeyUtil {
|
|||
SM4 sm4 = new SM4(Mode.CBC, Padding.PKCS5Padding, key, iv);
|
||||
return sm4.decryptStr(encryptData);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import cn.hutool.http.HttpRequest;
|
|||
import cn.hutool.http.HttpResponse;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.xxl.job.core.context.XxlJobHelper;
|
||||
import com.xxl.job.executor.inter.config.GlobalConfig;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
|
|
@ -21,8 +20,10 @@ import java.util.Map;
|
|||
public class PostUtils {
|
||||
|
||||
public static HttpResponse sendData(String body, String url) {
|
||||
XxlJobHelper.log("客户端传入参数body=：{}", body);
|
||||
XxlJobHelper.log("请求路径---->{}", url);
|
||||
// XxlJobHelper.log("客户端传入参数body=：{}", body);
|
||||
// XxlJobHelper.log("请求路径---->{}", url);
|
||||
System.err.println(url);
|
||||
System.err.println(body);
|
||||
//生成bodykey
|
||||
String bodyKey = KeyUtil.makeBodyKey();
|
||||
//对原文hash (sm3)
|
||||
|
|
@ -39,8 +40,6 @@ public class PostUtils {
|
|||
//请求体数据封装
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
jsonObject.set("encryptData", KeyUtil.encryptHexData(bodyKey, body));
|
||||
XxlJobHelper.log("客户端请求体传入参数加密后 encryptData=：{}", jsonObject);
|
||||
XxlJobHelper.log("客户端header传入参数加密后 headers=：{}", headers);
|
||||
//发送http请求
|
||||
return HttpRequest.post(url).addHeaders(headers).body(jsonObject.toString()).execute();
|
||||
}
|
||||
|
|
@ -49,20 +48,18 @@ public class PostUtils {
|
|||
public static String ebuildDecrypt(HttpResponse httpResponse, String sm2PriKey) {
|
||||
//解析header头里的secretToken原始json
|
||||
String secretToken = httpResponse.header("secretToken");
|
||||
XxlJobHelper.log("客户端接收到服务端header参数 secretToken----->{}", secretToken);
|
||||
//获取解密后json
|
||||
JSONObject headerJson = KeyUtil.getRandomKeyJson(sm2PriKey, secretToken);
|
||||
String bodyKey = headerJson.getStr("bodyKey");
|
||||
String body = JSONUtil.parseObj(httpResponse.body()).getStr("encryptData");
|
||||
XxlJobHelper.log("客户端接收到服务端参数 body----->{}", httpResponse.body());
|
||||
//解密数据
|
||||
String data = KeyUtil.getDecrypt(bodyKey, body);
|
||||
XxlJobHelper.log("客户端接收到服务端参数解密后数据 data----->{}", data);
|
||||
// XxlJobHelper.log("客户端接收到服务端参数解密后数据 data----->{}", data);
|
||||
String bodyDigest = SmUtil.sm3(data);
|
||||
if (bodyDigest.equals(headerJson.getStr("bodyDigest"))) {
|
||||
return data;
|
||||
} else {
|
||||
XxlJobHelper.handleFail("body体内容校验有问题！！！");
|
||||
// XxlJobHelper.handleFail("body体内容校验有问题！！！");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
package com.xxl.job.executor.inter.utils;
|
||||
|
||||
import cn.hutool.core.util.HexUtil;
|
||||
import cn.hutool.crypto.Mode;
|
||||
import cn.hutool.crypto.Padding;
|
||||
import cn.hutool.crypto.symmetric.SM4;
|
||||
import io.netty.util.internal.StringUtil;
|
||||
|
||||
public class Sm4Utils {
|
||||
private static String S1="3b893ea109d729ba7eb1a841649b5e6d";
|
||||
private static String S2="2cc0c5f9f1749f1632efa9f63e9013cd";
|
||||
|
||||
/**
|
||||
* 解密
|
||||
* @param encodeText
|
||||
* @return
|
||||
*/
|
||||
public static String decode(String encodeText){
|
||||
try{
|
||||
if(StringUtil.isNullOrEmpty(encodeText)){
|
||||
return "";
|
||||
}
|
||||
SM4 sm4 = new SM4(Mode.CBC, Padding.PKCS5Padding, HexUtil.decodeHex(S1),HexUtil.decodeHex(S2));
|
||||
return sm4.decryptStr(encodeText);
|
||||
}catch (Exception e){
|
||||
return encodeText;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 加密
|
||||
* @param encodeText
|
||||
* @return
|
||||
*/
|
||||
public static String encode(String encodeText){
|
||||
try{
|
||||
if(StringUtil.isNullOrEmpty(encodeText)){
|
||||
return "";
|
||||
}
|
||||
SM4 sm4 = new SM4(Mode.CBC, Padding.PKCS5Padding, HexUtil.decodeHex(S1),HexUtil.decodeHex(S2));
|
||||
return sm4.encryptHex(encodeText);
|
||||
}catch (Exception e){
|
||||
return encodeText;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package com.xxl.job.executor.inter.utils;
|
||||
|
||||
public class StringHelper {
|
||||
|
||||
public static boolean isEmpty(String str) {
|
||||
if (str == null || "".equals(str.trim())) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断字符串 不为空
|
||||
*/
|
||||
public static boolean isNotEmpty(String str) {
|
||||
return !isEmpty(str);
|
||||
}
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getProInfo")
|
||||
public void getProInfo(){
|
||||
interService.getProInfo();
|
||||
interService.getProInfo(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -28,23 +28,24 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getBidPro")
|
||||
public void getBidPro(){
|
||||
interService.getBidPro();
|
||||
interService.getBidPro(1);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 班组信息获取
|
||||
*/
|
||||
@XxlJob("getTeam")
|
||||
public void getTeam(){
|
||||
interService.getTeam();
|
||||
interService.getTeam(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 班组信息获取
|
||||
* 班组人员信息获取
|
||||
*/
|
||||
@XxlJob("getTeamPeople")
|
||||
public void getTeamPeople(){
|
||||
interService.getTeamPeople();
|
||||
interService.getTeamPeople(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -52,7 +53,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getTicket")
|
||||
public void getTicket(){
|
||||
interService.getTicket();
|
||||
interService.getTicket(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -60,7 +61,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getTicketPeople")
|
||||
public void getTicketPeople(){
|
||||
interService.getTicketPeople();
|
||||
interService.getTicketPeople(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -68,14 +69,14 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getDayPlan")
|
||||
public void getDayPlan(){
|
||||
interService.getDayPlan();
|
||||
interService.getDayPlan(1);
|
||||
}
|
||||
/**
|
||||
* 周计划
|
||||
*/
|
||||
@XxlJob("getWeeksPlan")
|
||||
public void getWeeksPlan(){
|
||||
interService.getWeeksPlan();
|
||||
interService.getWeeksPlan(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -83,14 +84,14 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getJJUser")
|
||||
public void getJJUser(){
|
||||
interService.getJJUser();
|
||||
interService.getJJUser(1);
|
||||
}
|
||||
/**
|
||||
* 布控球
|
||||
*/
|
||||
@XxlJob("getJJBall")
|
||||
public void getJJBall(){
|
||||
interService.getJJBall();
|
||||
interService.getJJBall(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -98,16 +99,10 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getJJBidInfo")
|
||||
public void getJJBidInfo(){
|
||||
interService.getJJBidInfo();
|
||||
interService.getJJBidInfo(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 工程履历
|
||||
*/
|
||||
@XxlJob("getGcLL")
|
||||
public void getGcLL(){
|
||||
interService.getGcLL();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -115,7 +110,9 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getClassMeetingInfo")
|
||||
public void getClassMeetingInfo() {
|
||||
interService.getClassMeetingInfo();
|
||||
System.err.println("开始执行123");
|
||||
interService.getClassMeetingInfo(1);
|
||||
System.err.println("结束执行123");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -123,7 +120,9 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getClassMeetingPeopleInfo")
|
||||
public void getClassMeetingPeopleInfo() {
|
||||
interService.getClassMeetingPeopleInfo();
|
||||
System.err.println("开始执行1234");
|
||||
interService.getClassMeetingPeopleInfo(1);
|
||||
System.err.println("结束执行1234");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -135,7 +134,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getSingleProjectInfo")
|
||||
public void getSingleProjectInfo() {
|
||||
interService.getSingleProjectInfo();
|
||||
interService.getSingleProjectInfo(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -147,7 +146,8 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getOnDutyInfo")
|
||||
public void getOnDutyInfo() {
|
||||
interService.getOnDutyInfo();
|
||||
|
||||
interService.getOnDutyInfo(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -159,7 +159,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getRiskPrecautionInfo")
|
||||
public void getRiskPrecautionInfo() {
|
||||
interService.getRiskPrecautionInfo();
|
||||
interService.getRiskPrecautionInfo(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -171,20 +171,9 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getUnitInfo")
|
||||
public void getUnitInfo() {
|
||||
interService.getUnitInfo();
|
||||
interService.getUnitInfo(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 扩展信息定时任务
|
||||
*
|
||||
* @return void
|
||||
* @author cwchen
|
||||
* @date 2024/5/8 14:53
|
||||
*/
|
||||
@XxlJob("getInfo")
|
||||
public void getInfo() {
|
||||
interService.getInfo();
|
||||
}
|
||||
|
||||
/**
|
||||
* 杆塔定时任务
|
||||
|
|
@ -195,7 +184,7 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getGtInfo")
|
||||
public void getGtInfo() {
|
||||
interService.getGtInfo();
|
||||
interService.getGtInfo(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -206,6 +195,148 @@ public class DataCenterXxlJob {
|
|||
*/
|
||||
@XxlJob("getDeptGcProject")
|
||||
public void getDeptGcProject() {
|
||||
interService.getDeptGcProject();
|
||||
interService.getDeptGcProject(1);
|
||||
}
|
||||
/**
|
||||
* 扩展信息定时任务
|
||||
*风险管控一本账 -风险预控措施
|
||||
* @return void
|
||||
* @author cwchen
|
||||
* @date 2024/5/8 14:53
|
||||
*/
|
||||
@XxlJob("getSmDwRiskPrecautionInfo")
|
||||
public void getSmDwRiskPrecautionInfo() {
|
||||
interService.getSmDwRiskPrecautionInfo(1);
|
||||
}
|
||||
/**
|
||||
* 扩展信息定时任务
|
||||
*施工作业票_预控措施
|
||||
* @return void
|
||||
* @author cwchen
|
||||
* @date 2024/5/8 14:53
|
||||
*/
|
||||
@XxlJob("getSmConstructionWorkTicketInfo")
|
||||
public void getSmConstructionWorkTicketInfo() {
|
||||
interService.getSmConstructionWorkTicketInfo(1);
|
||||
}
|
||||
/**
|
||||
* 扩展信息定时任务
|
||||
*预控措施_站班会
|
||||
* @return void
|
||||
* @author cwchen
|
||||
* @date 2024/5/8 14:53
|
||||
*/
|
||||
@XxlJob("getSmDwToolBoxTalkInfo")
|
||||
public void getSmDwToolBoxTalkInfo() {
|
||||
interService.getSmDwToolBoxTalkInfo(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 作业票->扩展信息
|
||||
*/
|
||||
@XxlJob("getSmConstructionWorkTicketInfo2")
|
||||
public void getSmConstructionWorkTicketInfo2() {
|
||||
interService.getSmConstructionWorkTicketInfo2(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 风险一本账扩展信息
|
||||
*/
|
||||
@XxlJob("getSmDwRiskPrecautionInfo2")
|
||||
public void getSmDwRiskPrecautionInfo2() {
|
||||
interService.getSmDwRiskPrecautionInfo2(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 站班会扩展信息
|
||||
*/
|
||||
@XxlJob("getSmDwToolBoxTalkInfo2")
|
||||
public void getSmDwToolBoxTalkInfo2() {
|
||||
interService.getSmDwToolBoxTalkInfo2(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 站班会_拆分扩展信息
|
||||
*/
|
||||
@XxlJob("getSmDwDataStandardExtInfo")
|
||||
public void getSmDwDataStandardExtInfo() {
|
||||
interService.getSmDwDataStandardExtInfo(1);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 扩展信息定时任务
|
||||
*预控措施_站班会
|
||||
* @return void
|
||||
* @author cwchen
|
||||
* @date 2024/5/8 14:53
|
||||
*/
|
||||
@XxlJob("getClassMettingInfo")
|
||||
public void getClassMettingInfo() {
|
||||
interService.getClassMettingInfo();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 固有风险清册
|
||||
*/
|
||||
@XxlJob("getJjRisk")
|
||||
public void getJjRisk() {
|
||||
interService.getJjRisk(1);
|
||||
}
|
||||
|
||||
/**
|
||||
*单项工程-安全
|
||||
*/
|
||||
@XxlJob("getSignInfoPro")
|
||||
public void getSignInfoPro() {
|
||||
interService.getSignInfoPro(1);
|
||||
}
|
||||
|
||||
/**
|
||||
*单项工程-工法
|
||||
*/
|
||||
@XxlJob("getProGf")
|
||||
public void getProGf() {
|
||||
interService.getProGf(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 工程履历
|
||||
*/
|
||||
@XxlJob("getGcLL")
|
||||
public void getGcLL(){
|
||||
interService.getGcLL(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 标段工程-新
|
||||
*/
|
||||
@XxlJob("getBidProNew")
|
||||
public void getBidProNew(){
|
||||
interService.getBidProNew(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 电力井
|
||||
*/
|
||||
@XxlJob("getJjDljData")
|
||||
public void getJjDljData(){
|
||||
interService.getJjDljData(1);
|
||||
}
|
||||
/**
|
||||
* 区段
|
||||
*/
|
||||
@XxlJob("getQdData")
|
||||
public void getQdData(){
|
||||
interService.getQdData(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 变电
|
||||
*/
|
||||
@XxlJob("getBdData")
|
||||
public void getBdData(){
|
||||
interService.getBdData(1);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
package com.xxl.job.executor.service.jobhandler;
|
||||
|
||||
import com.xxl.job.executor.inter.service.InterServiceTest;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
|
||||
/**
|
||||
* 数据中台 处理中心
|
||||
* @author 黑子
|
||||
*/
|
||||
//@Component
|
||||
//@EnableScheduling
|
||||
public class DataCenterXxlJobTest {
|
||||
|
||||
//@Autowired
|
||||
private InterServiceTest interService;
|
||||
|
||||
/**
|
||||
* 项目部定时任务
|
||||
* @return void
|
||||
* @author cwchen
|
||||
* @date 2024/5/8 16:00
|
||||
*/
|
||||
@Scheduled(cron = "0 30 * * * ?")
|
||||
@PostConstruct
|
||||
public void getProInfo() {
|
||||
System.err.println("1");
|
||||
interService.getProInfo(1);
|
||||
System.err.println("2");
|
||||
}
|
||||
@Scheduled(cron = "0 30 * * * ?")
|
||||
@PostConstruct
|
||||
public void getSingleProjectInfo() {
|
||||
System.err.println("sign");
|
||||
interService.getSingleProjectInfo(1);
|
||||
System.err.println("sign");
|
||||
}
|
||||
@Scheduled(cron = "0 30 * * * ?")
|
||||
@PostConstruct
|
||||
public void getBidPro() {
|
||||
System.err.println("bd");
|
||||
interService.getBidPro(1);
|
||||
System.err.println("bd");
|
||||
}
|
||||
@Scheduled(cron = "0 30 * * * ?")
|
||||
@PostConstruct
|
||||
public void getDeptGcProject() {
|
||||
System.err.println("bd");
|
||||
interService.getDeptGcProject(1);
|
||||
System.err.println("bd");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,11 +1,10 @@
|
|||
# web port
|
||||
server.port=8081
|
||||
server.port=18084
|
||||
# no web
|
||||
#spring.main.web-environment=false
|
||||
|
||||
# log config
|
||||
logging.config=classpath:logback.xml
|
||||
xxl.job.admin.addresses=http://127.0.0.1:8080/xxl-job-admin
|
||||
xxl.job.admin.addresses=http://20.51.8.9:18083/xxl-job-admin
|
||||
### xxl-job, access token
|
||||
xxl.job.accessToken=default_token
|
||||
### xxl-job executor appname
|
||||
|
|
@ -14,7 +13,7 @@ xxl.job.executor.appname=xxl-job-executor-sample
|
|||
xxl.job.executor.address=
|
||||
### xxl-job executor server-info
|
||||
xxl.job.executor.ip=
|
||||
xxl.job.executor.port=9999
|
||||
xxl.job.executor.port=18085
|
||||
### xxl-job executor log-path
|
||||
xxl.job.executor.logpath=/data/applogs/xxl-job/jobhandler
|
||||
### xxl-job executor log-retention-days
|
||||
|
|
@ -23,12 +22,21 @@ xxl.job.executor.logretentiondays=30
|
|||
mybatis.mapper-locations=classpath:/mapper/*Mapper.xml
|
||||
|
||||
### xxl-job, datasource
|
||||
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
|
||||
spring.datasource.username=root
|
||||
spring.datasource.password=bonus@admin123
|
||||
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=root
|
||||
#spring.datasource.password=bonus@admin123
|
||||
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||
|
||||
# ??SQL??
|
||||
spring.jpa.show-sql=true
|
||||
# ?????SQL??
|
||||
spring.jpa.properties.hibernate.format_sql=true
|
||||
### datasource-pool
|
||||
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
|
||||
spring.datasource.hikari.minimum-idle=10
|
||||
spring.datasource.hikari.maximum-pool-size=30
|
||||
spring.datasource.hikari.auto-commit=true
|
||||
spring.datasource.hikari.idle-timeout=30000
|
||||
spring.datasource.hikari.pool-name=HikariCP
|
||||
spring.datasource.hikari.max-lifetime=900000
|
||||
spring.datasource.hikari.connection-timeout=10000
|
||||
spring.datasource.hikari.connection-test-query=SELECT 1
|
||||
spring.datasource.hikari.validation-timeout=1000
|
||||
|
|
|
|||
|
|
@ -67,9 +67,36 @@
|
|||
<foreach collection="list" item="item" separator=",">(
|
||||
#{item.id},#{item.prjCode},#{item.singleProjectCode},#{item.biddingSectionCode},#{item.biddingSectionName},
|
||||
#{item.buildUnitCode},#{item.buildUnitCode},#{item.planStartDate},
|
||||
#{item.planFinDate},#{item.actualStartDate},#{item.actualFinDate},#{item.status},#{item.biddingSectionType},#{item.deleteFlag},#{item.createTime})
|
||||
#{item.planFinDate},#{item.actualStartDate},#{item.actualFinDate},#{item.constructionStatus},#{item.biddingSectionType},#{item.deleteFlag},#{item.createTime})
|
||||
</foreach>
|
||||
</insert>
|
||||
<!--插入标段工程数据-->
|
||||
<insert id="insertBidProNew">
|
||||
REPLACE into jj_bidding_project(
|
||||
id,constr_transformer_capacity,line_quantity,
|
||||
main_transformer_quantity, status,construction_status,
|
||||
sub_flag,plan_start_date, actual_start_date,
|
||||
plan_fin_date,actual_fin_date,prj_code,
|
||||
plan_compl_date,actual_compl_date,delete_flag,
|
||||
creater_id,create_time,updater_id,
|
||||
update_time,create_type,single_project_code,
|
||||
bidding_section_code,bidding_section_name,province_code,
|
||||
build_unit_code,bidding_section_type,construction_line_length
|
||||
) VALUES
|
||||
<foreach collection="list" item="item" separator=",">(
|
||||
#{item.id},#{item.constrTransformerCapacity},#{item.lineQuantity},
|
||||
#{item.mainTransformerQuantity},#{item.status},#{item.constructionStatus},
|
||||
#{item.subFlag},#{item.planStartDate},#{item.actualStartDate},
|
||||
#{item.planFinDate},#{item.actualFinDate},#{item.prjCode},
|
||||
#{item.planComplDate},#{item.actualComplDate},#{item.deleteFlag},
|
||||
#{item.createrId},#{item.createTime},#{item.updaterId},
|
||||
#{item.updateTime},#{item.createType},#{item.singleProjectCode},
|
||||
#{item.biddingSectionCode},#{item.biddingSectionName},#{item.provinceCode},
|
||||
#{item.buildUnitCode},#{item.biddingSectionType},#{item.constructionLineLength}
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
|
||||
<insert id="insertTeam">
|
||||
replace into jj_team
|
||||
|
|
@ -476,4 +503,203 @@
|
|||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
<insert id="insertSignInfoPro">
|
||||
REPLACE INTO jj_single_info(
|
||||
id,single_project_id, single_project_name,
|
||||
single_project_code,safety_code,safety_project_status,
|
||||
prj_local,province_code,build_unit_code,
|
||||
build_unit_con_person, build_unit_mobil, across_area,
|
||||
tower_no,actual_commencement_date,actual_finish_time,
|
||||
current_drp_rate,current_work_stage,tower_found_com_num,
|
||||
tower_assem_num,line_com_num, remark,
|
||||
last_suspend_time,last_resume_time,huv_flag,
|
||||
creater_id,create_time,updater_id,
|
||||
update_time,delete_flag,prj_type,
|
||||
single_project_type,prj_code, prj_name
|
||||
) VALUES
|
||||
<foreach collection="list" item="item" separator=",">
|
||||
(
|
||||
#{item.id},#{item.singleProjectId},#{item.singleProjectName},
|
||||
#{item.singleProjectCode},#{item.safetyCode},#{item.safetyProjectStatus},
|
||||
#{item.prjLocal},#{item.provinceCode},#{item.buildUnitCode},
|
||||
#{item.buildUnitConPerson},#{item.buildUnitMobil},#{item.acrossArea},
|
||||
#{item.towerNo},#{item.actualCommencementDate},#{item.actualFinishTime},
|
||||
#{item.currentDrpRate},#{item.currentWorkStage},#{item.towerFoundComNum},
|
||||
#{item.towerAssemNum},#{item.lineComNum},#{item.remark},
|
||||
#{item.lastSuspendTime},#{item.lastResumeTime},#{item.huvFlag},
|
||||
#{item.createrId},#{item.createTime},#{item.updaterId},
|
||||
#{item.updateTime},#{item.deleteFlag},#{item.prjType},
|
||||
#{item.singleProjectType},#{item.prjCode},#{item.prjName}
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
<insert id="insertGfData">
|
||||
REPLACE INTO jj_gf(
|
||||
id,risk_no,construction_method_name,
|
||||
huv_flag,province_code,delete_flag,
|
||||
creater_id,create_time,updater_id,
|
||||
update_time
|
||||
) VALUES
|
||||
<foreach collection="list" item="item" separator=",">
|
||||
(
|
||||
#{item.id},#{item.riskNo},#{item.constructionMethodName},
|
||||
#{item.huvFlag},#{item.provinceCode},#{item.deleteFlag},
|
||||
#{item.createrId},#{item.createTime},#{item.updaterId},
|
||||
#{item.updateTime}
|
||||
)
|
||||
</foreach>
|
||||
|
||||
</insert>
|
||||
|
||||
<insert id="insertJJRisk">
|
||||
REPLACE INTO jj_risk(
|
||||
id,risk_no,professional,
|
||||
part_subentry,work_type,work_procedure,
|
||||
risk_leve,min_constr_headcount, risk_assessment_value,
|
||||
consequence_due_to_risk,risk_control_key_factor,merge,
|
||||
remark,huv_flag,province_code,
|
||||
creater_id,create_time,updater_id,
|
||||
update_time,delete_flag
|
||||
) VALUES
|
||||
<foreach collection="list" item="item" separator=",">
|
||||
(
|
||||
#{item.id},#{item.riskNo},#{item.professional},
|
||||
#{item.partSubentry},#{item.workType},#{item.workProcedure},
|
||||
#{item.riskLeve},#{item.minConstrHeadcount},#{item.riskAssessmentValue},
|
||||
#{item.consequenceDueToRisk},#{item.riskControlKeyFactor},#{item.merge},
|
||||
#{item.remark},#{item.huvFlag},#{item.provinceCode},
|
||||
#{item.createrId},#{item.createTime},#{item.updaterId},
|
||||
#{item.updateTime},#{item.deleteFlag}
|
||||
)
|
||||
</foreach>
|
||||
|
||||
</insert>
|
||||
<select id="getJjRiskPrecautionList" resultType="com.xxl.job.executor.inter.entity.JjRiskPrecaution">
|
||||
select id
|
||||
from jj_risk_precaution
|
||||
where create_time between #{startTime} and #{endTime}
|
||||
|
||||
</select>
|
||||
<!--查询站班会关联信息-->
|
||||
<select id="getClassMettingList" resultType="com.xxl.job.executor.inter.entity.JjClassMeettingInfo">
|
||||
select jcm.id id,risk_precaution_id riskId,jt.team_id teamId,jt.working_team_name teamName,
|
||||
jtp.real_name workManage,jtp.id_card workManageNum,ju.mobile workManagePhone,
|
||||
jcm.ticket_id ticketId,jcm.current_constr_date
|
||||
FROM jj_class_meetting jcm
|
||||
left join jj_ticket jt on jcm.ticket_id=jt.id
|
||||
LEFT JOIN jj_team jte on jt.team_id=jt.id
|
||||
left join jj_team_people jtp on jtp.team_id=jt.team_id and jtp.position_code='0900101'
|
||||
left join jj_user ju on ju.personnel_id=jtp.personnel_id
|
||||
where jcm.current_constr_date between #{startTime} and #{endTime}
|
||||
</select>
|
||||
<select id="getWorkDetails" resultType="com.xxl.job.executor.inter.entity.WorkDetailsVo">
|
||||
select
|
||||
jrp.work_site_name workSite , -- 作业部位
|
||||
jrp.work_content content, -- 作业内容
|
||||
jrp.work_procedure workGx, -- 工序
|
||||
jdc.`value` workType -- 作业类型
|
||||
FROM jj_risk_precaution jrp
|
||||
LEFT JOIN jj_data_code jdc on jdc.code_value=jrp.work_type and jdc.`code`='WORK_TYPE'
|
||||
where jrp.id in(
|
||||
<foreach collection="list" item="item" separator=",">
|
||||
#{item}
|
||||
</foreach>
|
||||
)
|
||||
</select>
|
||||
<insert id="insertDataInfo">
|
||||
REPLACE INTO jj_class_metting_info(
|
||||
class_id,work_gx,work_type,team_name,
|
||||
work_manage,team_id,work_manage_phone,
|
||||
work_manage_num,work_content,work_site,main_risk)
|
||||
values(#{id},#{workGx},#{workType},#{teamName},
|
||||
#{workManage},#{teamId},#{workManagePhone},
|
||||
#{workManageNum},#{workContent},#{workSite},#{mainRisk})
|
||||
</insert>
|
||||
<insert id="insertTeamInfo">
|
||||
insert into jj_team_info (team_id)
|
||||
values (#{id})
|
||||
</insert>
|
||||
<insert id="insertDljData">
|
||||
insert into jj_dlj(
|
||||
id,single_project_code,bidding_section_code,
|
||||
well_no,well_type,longitude,
|
||||
latitude,east_coordinate,north_coordinate,
|
||||
well_depth,size,cover4g_flag,
|
||||
creater_id,create_time,updater_id,
|
||||
update_time, delete_flag,province_code,
|
||||
design_change_no, address,upstream_tower_no,
|
||||
custom_flag
|
||||
)values(#{id},#{singleProjectCode},#{biddingSectionCode},
|
||||
#{wellNo},#{wellType},#{longitude},
|
||||
#{latitude},#{eastCoordinate},#{northCoordinate},
|
||||
#{wellDepth},#{size},#{cover4gFlag},
|
||||
#{createrId},#{createTime},#{updaterId},
|
||||
#{updateTime},#{deleteFlag},#{provinceCode},
|
||||
#{designChangeNo},#{address},#{upstreamTowerNo},#{customFlag}
|
||||
)
|
||||
</insert>
|
||||
<insert id="insertQdData">
|
||||
insert into jj_qd(
|
||||
id,bidding_section_code,section_no,
|
||||
section_name,start_no,terminal_no,
|
||||
section_length,total_tower,total_tens_tower,
|
||||
creater_id,create_time,updater_id,
|
||||
update_time,delete_flag)values
|
||||
(#{id},#{biddingSectionCode},#{sectionNo},
|
||||
#{sectionName},#{startNo},#{terminalNo},
|
||||
#{sectionLength},#{totalTower},#{totalTensTower},
|
||||
#{createrId},#{createTime},#{updaterId},
|
||||
#{updateTime},#{deleteFlag})
|
||||
</insert>
|
||||
<insert id="insertJjBdData">
|
||||
insert into jj_bd(
|
||||
id,sin_prj_code,bid_sect_code,
|
||||
work_site_name,longitude, latitude,
|
||||
east_coordinate,north_coordinate,address,
|
||||
province_code,creater_id,create_time,
|
||||
update_time,updater_id,delete_flag
|
||||
)values (#{id},#{sinPrjCode},#{bidSectCode},
|
||||
#{workSiteName},#{longitude},#{latitude},
|
||||
#{eastCoordinate},#{northCoordinate},#{address},
|
||||
#{provinceCode},#{createrId},#{createTime},
|
||||
#{updateTime},#{updaterId},#{deleteFlag}
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
||||
<select id="getMainRisk" resultType="java.lang.String">
|
||||
select
|
||||
concat(replenish_content_1,IFNULL(replenish_content_2,''),IFNULL(replenish_content_3,'')
|
||||
,IFNULL(replenish_content_4,''),IFNULL(replenish_content_5,'')
|
||||
,IFNULL(replenish_content_6,''),IFNULL(replenish_content_7,'')
|
||||
) replenishContent
|
||||
from jj_info
|
||||
where delete_flag=0
|
||||
and ref_id=#{ticketId}
|
||||
and ext_type='40'
|
||||
and content_type='03'
|
||||
ORDER BY sort_no asc
|
||||
LIMIT 1
|
||||
</select>
|
||||
<select id="getTeamInfoNum" resultType="java.lang.Integer">
|
||||
select count(1)
|
||||
from jj_team_info
|
||||
where team_id=#{id}
|
||||
</select>
|
||||
<select id="getSmConstructionWorkTicketList" resultType="com.xxl.job.executor.inter.entity.JjTicket">
|
||||
select id
|
||||
from jj_ticket
|
||||
where create_time between #{startTime} and #{endTime}
|
||||
</select>
|
||||
<select id="getClassMettingIds" resultType="com.xxl.job.executor.inter.entity.JjClassMeetting">
|
||||
select jcm.id id
|
||||
FROM jj_class_meetting jcm
|
||||
where jcm.create_time between #{startTime} and #{endTime}
|
||||
</select>
|
||||
|
||||
<select id="getJjinfoList" resultType="com.xxl.job.executor.inter.entity.JjInfo">
|
||||
select jio.id
|
||||
from jj_info jio
|
||||
where jio.ext_type=60 and jio.create_time between #{startTime} and #{endTime}
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue