prod url路径修改

main
dongdingding 5 months ago
parent 0dfb16f003
commit 3380ca271d

@ -0,0 +1,99 @@
package com.mudu.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* (ASafeTfg)
*
* @author wu
* @since 2024-06-07 17:07:15
*/
@Data
@ApiModel("停复工表实体类")
public class ASafeTfg implements Serializable {
private static final long serialVersionUID = 140502563309362949L;
/**
*
*/
@ApiModelProperty(value = "主键")
private String xxbh;
/**
*
*/
@ApiModelProperty(value = "企业名称")
private String qymc;
/**
* ID
*/
@ApiModelProperty(value = "对应企业基础信息表中的主键ID")
private String qybh;
/**
*
*/
@ApiModelProperty(value = "统一社会信用代码")
private String tyshxydm;
/**
* yyyy-MM-dd HH:mm:ss
*/
@ApiModelProperty(value = "格式: yyyy-MM-dd HH:mm:ss")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date tgkssj;
/**
* yyyy-MM-dd HH:mm:ss
*/
@ApiModelProperty(value = "格式: yyyy-MM-dd HH:mm:ss")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date tgjssj;
/**
*
*/
@ApiModelProperty(value = "停工原因")
private String tgyy;
/**
*
*/
@ApiModelProperty(value = "停工附件信息")
private String fjxx;
/**
*
*/
@ApiModelProperty(value = "入库人员")
private String rkry;
/**
* yyyy-MM-dd HH:mm:ss
*/
@ApiModelProperty(value = "格式: yyyy-MM-dd HH:mm:ss")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date rksj;
/**
*
*/
@ApiModelProperty(value = "更新人员")
private String gxry;
/**
* yyyy-MM-dd HH:mm:ss
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(value = "格式: yyyy-MM-dd HH:mm:ss")
private Date gxsj;
/**
* 0
* 1
*/
@ApiModelProperty(value = "0逻辑删除 1正常")
private Integer jlzt;
/**
* 0 1 2
*/
@ApiModelProperty(value = "审核状态 0待审核 1已通过 2已驳回")
private String shzt;
}

@ -0,0 +1,78 @@
package com.mudu.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* (ASafeTfgsh)
*
* @author wu
* @since 2024-06-07 17:07:16
*/
@Data
@ApiModel("停复工审核信息表实体类")
@TableName(value = "a_safe_tfgsh")
public class ASafeTfgsh implements Serializable {
private static final long serialVersionUID = -60575438286733802L;
@TableId
private String xxbh;
/**
*
*/
@ApiModelProperty(value = "停复工编号")
private String tfgbh;
/**
*
*/
@ApiModelProperty(value = "审核时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String shsj;
/**
* 1 2
*/
@ApiModelProperty(value = "审核结果 1审核通过 2审核驳回")
private String shjg;
/**
*
*/
@ApiModelProperty(value = "原因")
private String yy;
/**
* 0 1
*/
@ApiModelProperty(value = "记录状态 0逻辑删除 1正常")
private Integer jlzt;
/**
*
*/
@ApiModelProperty(value = "更新时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date gxsj;
/**
*
*/
@ApiModelProperty(value = "更新人员")
private String gxry;
/**
*
*/
@ApiModelProperty(value = "创建时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date rksj;
/**
*
*/
@ApiModelProperty(value = "入库人员")
private String rkry;
}

@ -0,0 +1,118 @@
package com.mudu.entity.dto.request;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
* (ASafeBqbhpx)
*
* @author wu
* @since 2024-03-27 09:54:37
*/
@Data
@ApiModel("班前班后表实体类")
public class ASafeBqbhpxRequest implements Serializable {
private static final long serialVersionUID = -70204298929184134L;
/**
*
*/
@TableId(type = IdType.ASSIGN_UUID)
@ApiModelProperty(value = "信息编号")
private String xxbh;
/**
*
*/
@ApiModelProperty(value = "企业编号")
private String qybh;
/**
*
*/
@ApiModelProperty(value = "班组名称")
private String bzmc;
/**
*
*/
@ApiModelProperty(value = "班组长姓名")
private String bzzxm;
/**
*
*/
@ApiModelProperty(value = "参培人数")
private Integer cprs;
/**
*
*/
@ApiModelProperty(value = "培训时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date pxkssj;
/**
*
*/
@ApiModelProperty(value = "宣传内容简述")
private String xcnrjs;
/**
*
*/
@ApiModelProperty(value = "行政区划")
private String xzqh;
/**
*
*/
@ApiModelProperty(value = "行政区划名称")
private String xzqhmc;
/**
*
*/
@ApiModelProperty(value = "培训现场照片")
private String pxxctp;
/**
*
*/
@ApiModelProperty(value = "入库人员")
private String rkry;
/**
*
*/
@ApiModelProperty(value = "更新人员")
private String gxry;
/**
*
*/
@ApiModelProperty(value = "入库时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime rksj;
/**
*
*/
@ApiModelProperty(value = "更新时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime gxsj;
/**
*
*/
@ApiModelProperty(value = "记录状态")
private Integer jlzt;
/**
*
*/
@ApiModelProperty(value = "企业信息编号")
private String qyxxbh;
}

@ -0,0 +1,143 @@
package com.mudu.entity.dto.request;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
* (ASafeQyzypgl)
*
* @author wu
* @since 2024-03-27 09:55:35
*/
@Data
@ApiModel("实体类")
public class ASafeQyzypglRequest implements Serializable {
private static final long serialVersionUID = 496384598819764323L;
/**
*
*/
@TableId(type = IdType.ASSIGN_UUID)
@ApiModelProperty(value = "信息编号")
private String xxbh;
/**
* id
*/
@ApiModelProperty(value = "作业类型id")
private String zylxid;
/**
* value
*/
@ApiModelProperty(value = "作业类型value")
private String zylxvalue;
/**
*
*/
@ApiModelProperty(value = "作业时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date zysj;
/**
*
*/
@ApiModelProperty(value = "作业人员")
private String zyry;
/**
*
*/
@ApiModelProperty(value = "作业地点")
private String zydd;
/**
*
*/
@ApiModelProperty(value = "作业方式")
private String zyfs;
/**
*
*/
@ApiModelProperty(value = "作业原因")
private String zyyy;
/**
*
*/
@ApiModelProperty(value = "风险描述")
private String fxms;
/**
*
*/
@ApiModelProperty(value = "防范措施")
private String ffcs;
/**
* 0- 1- 2-
*/
@ApiModelProperty(value = "作业状态 0-待签名 1-待作业 2-已作业")
private String zyzt;
/**
*
*/
@ApiModelProperty(value = "企业编号")
private String qybh;
/**
*
*/
@ApiModelProperty(value = "企业名称")
private String qymc;
/**
*
*/
@ApiModelProperty(value = "所属部门")
private String ssbm;
/**
*
*/
@ApiModelProperty(value = "入库时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime rksj;
/**
*
*/
@ApiModelProperty(value = "更新时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime gxsj;
/**
*
*/
@ApiModelProperty(value = "入库人员")
private String rkry;
/**
*
*/
@ApiModelProperty(value = "更新人员")
private String gxry;
/**
*
*/
@ApiModelProperty(value = "记录状态")
private Integer jlzt;
/**
*
*/
@ApiModelProperty(value = "监护人员")
private String jhry;
/**
*
*/
@ApiModelProperty(value = "企业信息编号")
private String qyxxbh;
}

@ -0,0 +1,18 @@
package com.mudu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mudu.entity.ASafeTfg;
/**
* (ASafeTfg)访
*
* @author wu
* @since 2024-06-07 17:07:15
*/
public interface ASafeTfgMapper extends BaseMapper<ASafeTfg> {
}

@ -0,0 +1,15 @@
package com.mudu.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mudu.entity.ASafeTfgsh;
/**
* (ASafeTfgsh)访
*
* @author wu
* @since 2024-06-07 17:07:16
*/
public interface ASafeTfgshMapper extends BaseMapper<ASafeTfgsh> {
}

@ -11,16 +11,11 @@ import com.mudu.entity.dto.request.ACheckQuatzZichaRequest;
import com.mudu.entity.dto.response.ACheckXcTpResponse;
import com.mudu.entity.dto.response.RwzqUuidResponse;
import com.mudu.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.text.ParseException;
@ -87,7 +82,12 @@ public class AcheckTaskQuartz {
@Resource
private ASafeQyjcxxService aSafeQyjcxxService;
@Resource
private ASafeTfgService aSafeTfgService;
@Resource
private ASafeTfgshService aSafeTfgshService;
@Resource
private ASafeRwzqService aSafeRwzqService;
@ -112,6 +112,10 @@ public class AcheckTaskQuartz {
@Value("${xczqUrl}")
private String xczqUrl;
@Value("${tfgUrl}")
private String tfgUrl;
/**
*
*
@ -585,7 +589,7 @@ public class AcheckTaskQuartz {
}
@Scheduled(cron = "0 0 4 * * ? ")
@Scheduled(cron = "0 0 4 * * ? ")
// @Scheduled(cron = "0 0/5 * * * ?")
//@Scheduled(cron = "0 58 18 * * ?")
// @PostMapping("/zicha")
@ -870,6 +874,8 @@ public class AcheckTaskQuartz {
aSafeZcrw.setGxsj(new Date());
//更新人员
aSafeZcrw.setGxry(a.getAddUserID());
aSafeZcrw.setJlzt(1);
aSafeZcrwService.save(aSafeZcrw);
}
@ -954,4 +960,58 @@ public class AcheckTaskQuartz {
aSafeYhzgxxService.save(aSafeYhzgxx);
}
/**
*
*/
@Scheduled(cron = "0 0 4 * * ? ")
// @Scheduled(cron = "0 0/5 * * * ?")
// @PostMapping("/tfg")
// @ApiOperation(value = "停复工表")
public void tfg() {
//当前时间
Date currentDate = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String currentTimeString = dateFormat.format(currentDate);
//停复工表推送
String responseList = HttpRequest.get(tfgUrl).header("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8").execute().body();
JSONObject jsonResponseList = JSON.parseObject(responseList);
String dataList = jsonResponseList.getString("rows");
if (StrUtil.isEmpty(dataList)) {
return;
}
//获取企业编号
List<ASafeTfg> tfgList = JSON.parseArray(dataList, ASafeTfg.class);
for (ASafeTfg a : tfgList) {
ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(a.getQymc(), a.getTyshxydm());
String enterPriseId = aSafeQyjcxx.getXxbh();
String tyshxydm = aSafeQyjcxx.getTyshxybm();
a.setQybh(enterPriseId);
a.setTyshxydm(tyshxydm);
aSafeTfgService.save(a);
//停复工审核表推送
saveAsafeTfg(a, currentTimeString);
}
}
/**
*
*
* @param a
* @param currentTimeString
*/
private void saveAsafeTfg(ASafeTfg a, String currentTimeString) {
ASafeTfgsh aSafeTfgsh = new ASafeTfgsh();
aSafeTfgsh.setTfgbh(a.getXxbh());
aSafeTfgsh.setShsj(currentTimeString);
aSafeTfgsh.setShjg(String.valueOf(1));
aSafeTfgsh.setJlzt(1);
aSafeTfgsh.setGxsj(new Date());
aSafeTfgsh.setGxry(a.getGxry());
aSafeTfgsh.setRksj(new Date());
aSafeTfgsh.setRkry(a.getRkry());
aSafeTfgshService.save(aSafeTfgsh);
}
}

@ -1,5 +1,6 @@
package com.mudu.quartz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
@ -7,6 +8,8 @@ import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.mudu.entity.ASafeBqbhpx;
import com.mudu.entity.ASafeQyzypgl;
import com.mudu.entity.dto.request.ASafeBqbhpxRequest;
import com.mudu.entity.dto.request.ASafeQyzypglRequest;
import com.mudu.service.ASafeBqbhpxService;
import com.mudu.service.ASafeQyzypglService;
import org.springframework.beans.factory.annotation.Value;
@ -16,6 +19,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
@ -54,6 +58,7 @@ public class BqbhTszyQuartz {
// @GetMapping("/bqbh")
// @ApiOperation(value = "保存班前班后数据")
@Scheduled(cron = "0 0 1 * * ? ")
// @Scheduled(cron = "0 0/5 * * * ?")
public void saveBqbh() {
String res = HttpRequest.get(bqbhUrl).contentType("application/x-www-form-urlencoded;charset=UTF-8").execute().body();
JSONObject resObj = JSON.parseObject(res);
@ -61,14 +66,18 @@ public class BqbhTszyQuartz {
if (StrUtil.isEmpty(dataList)) {
return;
}
List<ASafeBqbhpx> list = JSON.parseArray(dataList, ASafeBqbhpx.class);
List<ASafeBqbhpx> aSafeBqbhpxes = new ArrayList<>();
List<ASafeBqbhpxRequest> list = JSON.parseArray(dataList, ASafeBqbhpxRequest.class);
list.forEach(x -> {
if (StrUtil.isNotEmpty(x.getPxxctp())) {
x.setPxxctp(api + x.getPxxctp());
ASafeBqbhpx aSafeBqbhpx = BeanUtil.copyProperties(x, ASafeBqbhpx.class);
if (StrUtil.isNotEmpty(aSafeBqbhpx.getPxxctp())) {
aSafeBqbhpx.setPxxctp(api + aSafeBqbhpx.getPxxctp());
}
aSafeBqbhpx.setQybh(x.getQyxxbh());
aSafeBqbhpxes.add(aSafeBqbhpx);
});
if (CollectionUtil.isNotEmpty(list)) {
safeBqbhpxService.saveBatch(list);
if (CollectionUtil.isNotEmpty(aSafeBqbhpxes)) {
safeBqbhpxService.saveBatch(aSafeBqbhpxes);
}
}
@ -78,6 +87,7 @@ public class BqbhTszyQuartz {
// @GetMapping("/tszy")
// @ApiOperation(value = "保存特殊作业数据")
@Scheduled(cron = "0 0 1 * * ? ")
// @Scheduled(cron = "0 0/5 * * * ?")
public void saveTszy() {
String res = HttpRequest.get(tszyUrl).contentType("application/x-www-form-urlencoded;charset=UTF-8").execute().body();
JSONObject resObj = JSON.parseObject(res);
@ -85,9 +95,15 @@ public class BqbhTszyQuartz {
if (StrUtil.isEmpty(dataList)) {
return;
}
List<ASafeQyzypgl> list = JSON.parseArray(dataList, ASafeQyzypgl.class);
if (CollectionUtil.isNotEmpty(list)) {
safeQyzypglService.saveBatch(list);
List<ASafeQyzypgl> aSafeQyzypgls = new ArrayList<>();
List<ASafeQyzypglRequest> list = JSON.parseArray(dataList, ASafeQyzypglRequest.class);
list.forEach(x -> {
ASafeQyzypgl aSafeQyzypgl = BeanUtil.copyProperties(x, ASafeQyzypgl.class);
aSafeQyzypgl.setQybh(x.getQyxxbh());
aSafeQyzypgls.add(aSafeQyzypgl);
});
if (CollectionUtil.isNotEmpty(aSafeQyzypgls)) {
safeQyzypglService.saveBatch(aSafeQyzypgls);
}
}
}

@ -0,0 +1,16 @@
package com.mudu.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mudu.entity.ASafeTfg;
/**
* (ASafeTfg)
*
* @author wu
* @since 2024-06-07 17:07:15
*/
public interface ASafeTfgService extends IService<ASafeTfg> {
}

@ -0,0 +1,16 @@
package com.mudu.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mudu.entity.ASafeTfgsh;
/**
* (ASafeTfgsh)
*
* @author wu
* @since 2024-06-07 17:07:16
*/
public interface ASafeTfgshService extends IService<ASafeTfgsh> {
}

@ -0,0 +1,17 @@
package com.mudu.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mudu.entity.ASafeTfg;
import com.mudu.mapper.ASafeTfgMapper;
import com.mudu.service.ASafeTfgService;
import org.springframework.stereotype.Service;
/**
* @author dong
* @since 2024/6/11 10:43
*/
@Service("aSafeTfgService")
public class ASafeTfgServiceImpl extends ServiceImpl<ASafeTfgMapper, ASafeTfg> implements ASafeTfgService {
}

@ -0,0 +1,20 @@
package com.mudu.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mudu.entity.ASafeTfgsh;
import com.mudu.mapper.ASafeTfgshMapper;
import com.mudu.service.ASafeTfgshService;
import org.springframework.stereotype.Service;
/**
* (ASafeTfgsh)
*
* @author wu
* @since 2024-06-07 17:07:16
*/
@Service("aSafeTfgshService")
public class ASafeTfgshServiceImpl extends ServiceImpl<ASafeTfgshMapper, ASafeTfgsh> implements ASafeTfgshService {
}

@ -78,11 +78,15 @@ imUrl: https://www.jichuanglanhai.com:88/csapi/mudu/quatz/get
zcXxUrl: https://www.jichuanglanhai.com:88/csapi/mudu/quatz/zicha
# 班前班后
bqbhUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeBqbhpx/findAll
#bqbhUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeBqbhpx/findAll
bqbhUrl: http://localhost:9028/mudu/aSafeBqbhpx/findAll
# 特殊作业
tszyUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeQyzypgl/findAll
#tszyUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeQyzypgl/findAll
tszyUrl: http://localhost:9028/mudu/aSafeQyzypgl/findAll
#停复工url
#tfgUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeTfg
tfgUrl: http://localhost:9028/mudu/aSafeTfg
#自查周期url
zczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeZcrwRead/getByxxbh

@ -55,4 +55,7 @@ tszyUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeQyzypgl/findAll
zczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeZcrwRead/getByxxbh
#巡查周期url
xczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeXcrwRead/getByxxbh
xczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeXcrwRead/getByxxbh
#停复工url
tfgUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeTfg

@ -57,4 +57,10 @@ zczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeZcrwRead/getByxxbh
#巡查周期url
xczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeXcrwRead/getByxxbh
xczqUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeXcrwRead/getByxxbh
#停复工url
tfgUrl: https://www.jichuanglanhai.com:88/csapi/mudu/aSafeTfg

@ -10,7 +10,7 @@
FROM a_safe_qyjcxx asq
<where>
<if test="qymc != null and qymc.trim() != ''">
<if test="xybm == null and xybm.trim() == ''">
<if test="xybm == null or xybm.trim() == ''">
and (REPLACE ( REPLACE ( asq.qymc, '', '(' ), '', ')' ) like concat('%',REPLACE ( REPLACE (
#{qymc}, '', '(' ), '', ')' ),'%'))
</if>

Loading…
Cancel
Save