guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pet' into pet

liujun-2024-05-23-接口漏洞修复
guoyuepeng 2024-04-23 09:38:55 +08:00
parent e9d80a8016 2be4c2a38a
commit a475cc1df7
24 changed files with 516 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -67,7 +67,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>

28
src/main/java/com/zcloud/controller/app/highriskwork/AppHotworkCfdController.java
View File

@ -896,6 +896,7 @@ public class AppHotworkCfdController extends BaseController {
pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME"));
pd2.put("CONFIRM_CONTENT", pd.get("CONTENT"));
pd2.put("CONFIRM_OTHER_CONTENT", pd.get("APPROVAL_CONTENT"));
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
hotworkCfdService.edit(pd2);
log.put("ACTION", "作业单位通过");
@ -925,6 +926,7 @@ public class AppHotworkCfdController extends BaseController {
condition.put("APPROVAL_SIGNATURE",Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
condition.put("APPROVAL_SIGNATURE_TIME",pd.get("SIGNER_TIME"));
condition.put("APPROVAL_STATUS",pd.getString("APPROVAL_STATUS"));
condition.put("APPROVAL_CONTENT",pd.getString("APPROVAL_CONTENT"));
hotworkCfdService.approval(condition);
}
break;
@ -1095,6 +1097,14 @@ public class AppHotworkCfdController extends BaseController {
case "7"://班长
if (files != null && files.length > 0) {
PageData condition = new PageData();
condition.put("HOTWORK_ID",pd2.getString("HOTWORK_ID"));
List<PageData> acceptUsers = hotworkAcceptUserCfdService.listAll(condition);
if (acceptUsers.size() <= 0){
map.put("code","9999");
map.put("errorMessage","接受交底人未签字");
return map;
}
MultipartFile file = files[0];
String ffile = DateUtil.getDays();
@ -1197,6 +1207,13 @@ public class AppHotworkCfdController extends BaseController {
//sendMessageUtil.sendMessages(mes, paramsList);
}
break;
case "-1.5": {//确认
log.put("ACTION", "作业负责人打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
pd2.put("AUDIT_CONTENT", pd.get("CONTENT"));
hotworkCfdService.edit(pd2);
break;
}
case "-2": {//确认打回
log.put("ACTION", "作业单位打回");
pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS"));
@ -1542,6 +1559,10 @@ public class AppHotworkCfdController extends BaseController {
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd);
List<PageData> varList = hotworkCfdService.jhlist(page); //列出confinedspace列表
// created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人
for(PageData dto: varList){
hotworkCfdService.addInfo(dto);
}
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
@ -1563,6 +1584,10 @@ public class AppHotworkCfdController extends BaseController {
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd);
List<PageData> varList = hotworkCfdService.aqlist(page); //列出confinedspace列表
// created by liu jun 2024/02/03 description: 拼接动火交底人、项目主管部门、安全项检查人
for(PageData dto: varList){
hotworkCfdService.addInfo(dto);
}
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
@ -1838,6 +1863,7 @@ public class AppHotworkCfdController extends BaseController {
condition.put("CORPINFO_ID",request.get("CORPINFO_ID"));
condition.put("TYPE","2");
condition.put("APPROVAL_STATUS","1");
condition.put("APPROVAL_CONTENT", request.getString("APPROVAL_CONTENT"));
hotworkCfdService.confessApproval(condition, files);
// 保存安全项信息
@ -1859,6 +1885,8 @@ public class AppHotworkCfdController extends BaseController {
measures.put("CONFIRM_NAME", request.get("ACTION_USER"));
hotworkToMeasuresCfdService.save(measures);
}
// 保存其他审批意见
response.put("result", "success");
return response;
} catch (Exception e) {

84
src/main/java/com/zcloud/controller/dw/DwController.java Normal file
View File

@ -0,0 +1,84 @@
package com.zcloud.controller.dw;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.PageData;
import com.zcloud.entity.Page;
import com.zcloud.service.dw.DwService;
import com.zcloud.service.dw.dto.*;
import com.zcloud.util.Jurisdiction;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@RestController
@RequestMapping(value = "/dingWei")
public class DwController extends BaseController {
@Resource
private DwService dwService;
@RequestMapping(value = "getTrace")
public Object getTrace() throws Exception {
PageData pd = this.getPageData();
TraceGet traceGet = JSONObject.parseObject(JSONObject.toJSONString(pd), TraceGet.class);
return dwService.getTrace(traceGet);
}
@RequestMapping(value = "getMapList")
public Object getMapList(Page page) throws Exception {
PageData pd = this.getPageData();
MapGet mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), MapGet.class);
if (mapGet.getPage() == null){
mapGet.setPage(new com.zcloud.service.dw.dto.Page());
}
mapGet.setCorpId(Jurisdiction.getCORPINFO_ID());
mapGet.getPage().setCurrent(String.valueOf(page.getCurrentPage()));
mapGet.getPage().setSize(String.valueOf(page.getShowCount()));
return dwService.getMapList(mapGet);
}
@RequestMapping(value = "saveOrUpdateMap")
public Object saveOrUpdateMap() throws Exception {
PageData pd = this.getPageData();
MapInfo mapGet = JSONObject.parseObject(pd.getString("data"), MapInfo.class);
return dwService.saveOrUpdateMap(mapGet);
}
@RequestMapping(value = "deleteMap")
public Object deleteMap() throws Exception {
PageData pd = this.getPageData();
DeleteDto deleteDto = new DeleteDto();
deleteDto.setId(pd.getString("id"));
deleteDto.setOperatorId(Jurisdiction.getUSER_ID());
deleteDto.setOperatorName(Jurisdiction.getName());
return dwService.deleteMap(deleteDto);
}
@RequestMapping(value = "getAlarmList")
public Object getAlarmList(Page page) throws Exception {
PageData pd = this.getPageData();
AlarmGet mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), AlarmGet.class);
if (mapGet.getPage() == null){
mapGet.setPage(new com.zcloud.service.dw.dto.Page());
}
mapGet.getPage().setCurrent(String.valueOf(page.getUrlCurrentPage()));
mapGet.getPage().setSize(String.valueOf(page.getShowCount()));
return dwService.getAlarmList(mapGet);
}
@RequestMapping(value = "manageAlarm")
public Object manageAlarm() throws Exception {
PageData pd = this.getPageData();
AlarmManageDto mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), AlarmManageDto.class);
mapGet.setAlarmId(pd.getString("DW_ALARM_ID"));
return dwService.manageAlarm(mapGet);
}
@RequestMapping(value = "getDictionary")
public Object getDictionary() throws Exception {
return dwService.getDictionary();
}
}

81
src/main/java/com/zcloud/controller/map/MapController.java
View File

@ -1,9 +1,16 @@
package com.zcloud.controller.map;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.bus.CorpInfoService;
import com.zcloud.service.dw.DwService;
import com.zcloud.service.dw.dto.AlarmGet;
import com.zcloud.service.dw.dto.MapGet;
import com.zcloud.service.dw.dto.MapInfo;
import com.zcloud.service.dw.dto.TraceGet;
import com.zcloud.service.keyProjects.VideoManagerService;
import com.zcloud.service.map.*;
import com.zcloud.service.map.util.ReturnMap;
@ -24,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import java.util.*;
/**
@ -73,6 +81,8 @@ public class MapController extends BaseController {
@Autowired
private WeatherUtil weatherUtil;
@Resource
private DwService dwService;
@ResponseBody
@RequestMapping("/getCorpInfo")
@ -864,12 +874,75 @@ public class MapController extends BaseController {
public Object getPersonByCardNo() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
PageData pd = this.getPageData();
PageData value = usersService.getPersonByCardNo(pd);
map.put("result", "success");
map.put("pd", value);
return map;
// TODO 判断是否是公司人员定位
if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) {
MapGet mapGet = new MapGet();
mapGet.setId(pd.getString("CARDNO"));
Object message = dwService.getMapInfo(mapGet);
map = JSONObject.parseObject(JSONObject.toJSONString(message), new TypeReference<Map<String, Object>>() {
});
if (map.get("code") == null || 200 != Integer.parseInt(map.get("code").toString())) {
return map;
} else {
MapInfo info = JSONObject.parseObject(JSONObject.toJSONString(map.get("info")), MapInfo.class);
PageData condition = new PageData();
condition.put("USER_ID", info.getRequired().getUserId());
PageData userInfo = usersService.findById(condition);
HashMap<String, String> otherInfo = new HashMap<>();
otherInfo.put("postName", userInfo.getString("postName"));
otherInfo.put("personType", userInfo.getString("PERSON_TYPE"));
map.put("otherInfo", otherInfo);
return map;
}
} else {
PageData value = usersService.getPersonByCardNo(pd);
map.put("result", "success");
map.put("pd", value);
return map;
}
}
@RequestMapping(value = "/getPersonTrace")
@ResponseBody
public Object getPersonTrace() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
PageData pd = this.getPageData();
// TODO 判断是否是公司人员定位
if (true){
TraceGet mapInfo = new TraceGet();
mapInfo.setId(pd.getString("id"));
return dwService.getTrace(mapInfo);
}else {
PageData value = usersService.getPersonByCardNo(pd);
map.put("result", "success");
map.put("pd", value);
return map;
}
}
@RequestMapping(value = "/getAlarmList")
@ResponseBody
public Object getAlarmList() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
PageData pd = this.getPageData();
// TODO 判断是否是公司人员定位
if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) {
AlarmGet alarmGet = new AlarmGet();
alarmGet.setPage(new com.zcloud.service.dw.dto.Page());
alarmGet.getPage().setCurrent("1");
alarmGet.getPage().setSize("20");
alarmGet.setCorpId(pd.getString("corpId"));
return dwService.getAlarmList(alarmGet);
}else {
PageData value = usersService.getPersonByCardNo(pd);
map.put("result", "success");
map.put("pd", value);
return map;
}
}
/**
* 获取摄像头播放路径(曹妃甸使用）
*

2
src/main/java/com/zcloud/mapper/datasource/highriskwork/BusHotworkCfdExamineMapper.java
View File

@ -26,5 +26,7 @@ public interface BusHotworkCfdExamineMapper {
List<PageData> findByCondition(PageData condition);
List<PageData> safetylistPage(Page page);
List<PageData> listAllByHotWorkId(PageData condition);
}

16
src/main/java/com/zcloud/service/dw/DwService.java Normal file
View File

@ -0,0 +1,16 @@
package com.zcloud.service.dw;
import com.zcloud.service.dw.dto.*;
public interface DwService {
Object getMapInfo(MapGet param) throws Exception;
Object getMapList(MapGet param) throws Exception;
Object saveOrUpdateMap(MapInfo param) throws Exception;
Object getTrace(TraceGet param) throws Exception;
Object getAlarmList(AlarmGet param) throws Exception;
Object manageAlarm(AlarmManageDto param) throws Exception;
Object getDictionary() throws Exception;
Object deleteMap(DeleteDto deleteDto);
}

14
src/main/java/com/zcloud/service/dw/dto/AlarmGet.java Normal file
View File

@ -0,0 +1,14 @@
package com.zcloud.service.dw.dto;
import lombok.Data;
@Data
public class AlarmGet {
private String startTime;
private String endTime;
private String status;
private String corpId;
private Page page;
}

12
src/main/java/com/zcloud/service/dw/dto/AlarmManageDto.java Normal file
View File

@ -0,0 +1,12 @@
package com.zcloud.service.dw.dto;
import lombok.Data;
@Data
public class AlarmManageDto {
private String status;
private String alarmId;
private String opinion;
private String operator;
private String operatorName;
}

14
src/main/java/com/zcloud/service/dw/dto/DeleteDto.java Normal file
View File

@ -0,0 +1,14 @@
package com.zcloud.service.dw.dto;
import lombok.Data;
import java.util.List;
@Data
public class DeleteDto {
private String id;
private List<String> ids;
private String operatorId;
private String operatorName;
}

18
src/main/java/com/zcloud/service/dw/dto/MapGet.java Normal file
View File

@ -0,0 +1,18 @@
package com.zcloud.service.dw.dto;
import lombok.Data;
@Data
public class MapGet {
private String departmentId;
private String userId;
private String userName;
private String corpId;
private String userCardId;
private String userPhone;
private String deviceId;
private String deviceName;
private String type;
private String id;
private Page page;
}

14
src/main/java/com/zcloud/service/dw/dto/MapInfo.java Normal file
View File

@ -0,0 +1,14 @@
package com.zcloud.service.dw.dto;
import lombok.Data;
@Data
public class MapInfo {
private MapRequired required;
//其他系统备注
private String idRemark;
//备注
private String remark;
private String dwUserMapId;
}

40
src/main/java/com/zcloud/service/dw/dto/MapRequired.java Normal file
View File

@ -0,0 +1,40 @@
package com.zcloud.service.dw.dto;
import lombok.Data;
@Data
public class MapRequired {
//映射类型（0-人员，1-设备）
private String type;
private String typeName;
//人员id
private String userId;
//人员姓名
private String userName;
//身份证号
private String userCardId;
//手机号
private String userPhone;
//设备id
private String deviceId;
//设备名称
private String deviceName;
//部门id
private String departmentId;
//部门名称
private String departmentName;
//企业id名称
private String corpId;
//企业名称
private String corpName;
//其他系统id
private String id;
//数据创建人id
private String creatorId;
//数据创建人名称
private String creatorName;
//数据更新时间
private String operatorId;
//数据更新人id
private String operatorName;
}

10
src/main/java/com/zcloud/service/dw/dto/Page.java Normal file
View File

@ -0,0 +1,10 @@
package com.zcloud.service.dw.dto;
import lombok.Data;
@Data
public class Page {
private String page;
private String size;
private String current;
}

11
src/main/java/com/zcloud/service/dw/dto/TraceGet.java Normal file
View File

@ -0,0 +1,11 @@
package com.zcloud.service.dw.dto;
import lombok.Data;
@Data
public class TraceGet {
private String user_id;
private String id;
private String startTime;
private String endTime;
}

70
src/main/java/com/zcloud/service/dw/impl/DwServiceImpl.java Normal file
View File

@ -0,0 +1,70 @@
package com.zcloud.service.dw.impl;
import com.zcloud.entity.PageData;
import com.zcloud.service.bus.CorpInfoService;
import com.zcloud.service.dw.DwService;
import com.zcloud.service.dw.dto.*;
import com.zcloud.util.HttpUtil;
import com.zcloud.util.Jurisdiction;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class DwServiceImpl implements DwService {
@Value("${dw.url}")
private String url;
@Resource
private CorpInfoService corpInfoService;
@Override
public Object getMapInfo(MapGet param) throws Exception {
return HttpUtil.post(url + "dw/getMapInfo", param);
}
@Override
public Object getMapList(MapGet param) throws Exception {
return HttpUtil.post(url + "dw/getMapList", param);
}
@Override
public Object saveOrUpdateMap(MapInfo param) throws Exception {
param.getRequired().setCreatorId(Jurisdiction.getUSER_ID());
param.getRequired().setCreatorName(Jurisdiction.getName());
param.getRequired().setOperatorId(Jurisdiction.getUSER_ID());
param.getRequired().setOperatorName(Jurisdiction.getName());
param.getRequired().setCorpId(Jurisdiction.getCORPINFO_ID());
PageData condition = new PageData();
condition.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
param.getRequired().setCorpName(corpInfoService.findById(condition).getString("CORP_NAME"));
return HttpUtil.post(url + "dw/saveOrUpdateMap", param);
}
@Override
public Object getTrace(TraceGet param) throws Exception {
return HttpUtil.post(url + "dw/getTrace", param);
}
@Override
public Object getAlarmList(AlarmGet param) throws Exception {
return HttpUtil.post(url + "dw/getAlarmList", param);
}
@Override
public Object manageAlarm(AlarmManageDto param) throws Exception {
return HttpUtil.post(url + "dw/manageAlarm", param);
}
@Override
public Object getDictionary() throws Exception {
return HttpUtil.post(url + "dw/getDictionary", "");
}
@Override
public Object deleteMap(DeleteDto deleteDto) {
return HttpUtil.post(url + "dw/deleteMap", deleteDto);
}
}

1
src/main/java/com/zcloud/service/firemanager/impl/FireRegionServiceImpl.java
View File

@ -182,6 +182,7 @@ public class FireRegionServiceImpl implements FireRegionService {
pd.put("FIRE_REGION_NAME", name);
pd.put("FIRE_REGION_CODE", bianma);
pd.put("DEPARTMENT_ID", departId);
pd.put("PHOTO_UPLOAD_METHOD", "1"); // 默认上传照片方式为相机
pd.put("ISDELETE", 0);
this.saveInfo(pd);
return pd;

7
src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
View File

@ -154,6 +154,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
entity.put("APPROVAL_SIGNATURE", info.getString("APPROVAL_SIGNATURE"));
entity.put("APPROVAL_SIGNATURE_TIME", info.getString("APPROVAL_SIGNATURE_TIME"));
entity.put("APPROVAL_STATUS", info.getString("APPROVAL_STATUS"));
entity.put("APPROVAL_CONTENT",info.getString("APPROVAL_CONTENT"));
busHotworkCfdExamineMapper.edit(entity);
}
@ -231,6 +232,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
entity.put("APPROVAL_STATUS", request.getString("APPROVAL_STATUS"));
entity.put("APPROVAL_SIGNATURE", Warden.saveFile(files,request.getString("CORPINFO_ID")));
entity.put("APPROVAL_SIGNATURE_TIME", DateUtil.getTime());
entity.put("APPROVAL_CONTENT",request.getString("APPROVAL_CONTENT"));
busHotworkCfdExamineMapper.edit(entity);
}
@ -283,7 +285,8 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
hotworkCfdMapper.delete(pd);
PageData condition = new PageData();
condition.put("HOTWORK_ID", pd.getString("HOTWORK_ID"));
List<PageData> oldEntity = busHotworkCfdExamineMapper.listAll(condition);
// List<PageData> oldEntity = busHotworkCfdExamineMapper.listAll(condition);
List<PageData> oldEntity = busHotworkCfdExamineMapper.listAllByHotWorkId(condition);
for (PageData entity : oldEntity) {
entity.put("IS_DELETE", "1");
busHotworkCfdExamineMapper.edit(entity);
@ -466,6 +469,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
pd.put("BELONGING_OPINIONS", belong.getString("APPROVAL_OPINIONS"));
pd.put("BELONGING_SIGNATURE", belong.getString("APPROVAL_SIGNATURE"));
pd.put("BELONGING_SIGNATURE_TIME", belong.getString("APPROVAL_SIGNATURE_TIME"));
pd.put("BELONGING_USER_MEASURES", belong.getString("APPROVAL_CONTENT"));
// 安全项检查人
PageData safety = approvalInfos.stream().filter(x -> "2".equals(x.getString("TYPE"))).findFirst().orElse(null);
pd.put("SAFETY_USER_ID", safety.getString("USER_ID"));
@ -474,6 +478,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
pd.put("SAFETY_DEPARTMENT_NAME", safety.getString("DEPARTMENT_NAME"));
pd.put("SAFETY_SIGNATURE", safety.getString("APPROVAL_SIGNATURE"));
pd.put("SAFETY_SIGNATURE_TIME", safety.getString("APPROVAL_SIGNATURE_TIME"));
pd.put("SAFETY_USER_MEASURES",safety.getString("APPROVAL_CONTENT"));
}
}

6
src/main/java/com/zcloud/service/map/impl/MeteorologicalinfoServiceImpl.java
View File

@ -234,12 +234,10 @@ public class MeteorologicalinfoServiceImpl implements MeteorologicalinfoService
pd.put("OUTSOURCED_ID",pd.getString("CORPINFO_ID"));
List<PageData> getListByCorpinfoId = meteorologicalMapper.listAll(pd);
if(getListByCorpinfoId.size() > 0){
String codes = "";
List<String> codes = new ArrayList<String>();
for (PageData met : getListByCorpinfoId){
codes += "'" + met.getString("CODE")+"',";
codes.add(met.getString("CODE"));
}
System.out.println();
codes = codes.substring(0,codes.length()-1);
pd.put("codes",codes);
return meteorologicalinfoMapper.listbymeteorologicalByCodes(pd);
}

55
src/main/java/com/zcloud/util/HttpUtil.java Normal file
View File

@ -0,0 +1,55 @@
package com.zcloud.util;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import org.apache.poi.ss.formula.functions.T;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.client.RestTemplate;
import java.util.HashMap;
import java.util.Map;
public class HttpUtil<K,V> {
private static final Logger LOGGER = LoggerFactory.getLogger(HttpUtil.class);
/**
* 返回成功状态码
*/
private static final int SUCCESS_CODE = 200;
public HashMap<K,V> doPost(String url, HashMap<String, String> info) {
RestTemplate restTemplate = new RestTemplate();
String result = restTemplate.postForEntity(url, info, String.class).getBody();
return JSONObject.parseObject(result, new TypeReference<HashMap<K, V>>() {});
}
public HashMap<K,V> doPost(String url, Object info) {
RestTemplate restTemplate = new RestTemplate();
String result = restTemplate.postForEntity(url, info, String.class).getBody();
return JSONObject.parseObject(result, new TypeReference<HashMap<K, V>>() {});
}
public T doPost(String url, Object info, Class<T> responseType) {
RestTemplate restTemplate = new RestTemplate();
String result = restTemplate.postForEntity(url, info, String.class).getBody();
return JSONObject.parseObject(result, responseType);
}
public static <T> T post(String url, Object info, Class<T> responseType) {
RestTemplate restTemplate = new RestTemplate();
return restTemplate.postForEntity(url, info, responseType).getBody();
}
public static Object post(String url, Object info) {
RestTemplate restTemplate = new RestTemplate();
String result = restTemplate.postForEntity(url, info, String.class).getBody();
return JSONObject.parseObject(result, Map.class);
}
public static Object post(String url) {
RestTemplate restTemplate = new RestTemplate();
String result = restTemplate.getForObject(url, String.class);
return JSONObject.parseObject(result, Map.class);
}
}

3
src/main/java/com/zcloud/util/RecordHalfMonthScheduled.java
View File

@ -57,7 +57,7 @@ public class RecordHalfMonthScheduled {
}
}
@Scheduled(cron ="0 0 1 1,16 1-12 ?") //每月1号、16号 01:00
// @Scheduled(cron ="0 0 1 1,16 1-12 ?") //每月1号、16号 01:00
// @Scheduled(cron ="*/20 * * * * ?")//测试
public void equipmentNotChecked(){
System.out.println("============每半月定时增加超期未检查消防设备记录==========");
@ -91,7 +91,6 @@ public class RecordHalfMonthScheduled {
pageData.put("CORPINFO_ID", corpinfoId);
pageData.put("PERIODSTART", finalStartTime);
pageData.put("PERIODEND", finalEndTime);
pageData.put("PHONE_REPEAT", "1");
//'添加人''添加时间''修改人''修改时间'
pageData.put("CREATOR", "adminTask");
pageData.put("CREATTIME", DateUtil.date2Str(new Date()));

6
src/main/resources/application-master.properties
View File

@ -62,7 +62,7 @@ qa-regulatory-gwj.api.url=http://192.168.192.201:8092/qa-regulatory-gwj/
smb.host=192.168.192.201
smb.port=22
smb.user=root
smb.password=SJSKAQHBGLXT@20220311
smb.password=SJSKaqhb@20240131
smb.basePath=/mnt/qask/file/
#Mq\u914D\u7F6E
rocketmq.consumer.group2=edu-admin-edit
@ -85,8 +85,8 @@ mq.group.info=scheduled_tasks
mq.group.eightWork=scheduled_tasks_eightWork
corp.default.pic-path=http://192.168.192.201:8991/file/
corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/
corp.default.pic-path=https://skqhdg.porthebei.com:9004/file/
corp.default.back-end-path=https://skqhdg.porthebei.com:9004/qa-prevention-gwj/
#数据同步topic
mq.gwj.data.topic=czks_docking
mq.gwj.file.topic=czks_dockingPicture

16
src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
View File

@ -25,7 +25,8 @@
f.APPROVAL_STATUS,
f.IS_DELETE,
f.CREATE_TIME,
f.REMARK
f.REMARK,
f.APPROVAL_CONTENT
</sql>
<sql id="Field2">
@ -47,7 +48,8 @@
APPROVAL_STATUS,
IS_DELETE,
CREATE_TIME,
REMARK
REMARK,
APPROVAL_CONTENT
</sql>
<sql id="FieldValue">
@ -69,7 +71,8 @@
#{APPROVAL_STATUS},
#{IS_DELETE},
#{CREATE_TIME},
#{REMARK}
#{REMARK},
#{APPROVAL_CONTENT}
</sql>
<!-- 新增 -->
@ -103,7 +106,8 @@
APPROVAL_STATUS = #{APPROVAL_STATUS},
IS_DELETE = #{IS_DELETE},
CREATE_TIME = #{CREATE_TIME},
REMARK = #{REMARK}
REMARK = #{REMARK},
APPROVAL_CONTENT = #{APPROVAL_CONTENT}
where HOTWORK_EXAMINE_ID = #{HOTWORK_EXAMINE_ID}
</update>
@ -304,5 +308,9 @@
ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
</select>
<select id="listAllByHotWorkId" resultType="com.zcloud.entity.PageData">
select * from bus_hotwork_cfd_examine f where f.HOTWORK_ID = #{HOTWORK_ID}
</select>
</mapper>

11
src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml
View File

@ -88,7 +88,8 @@
f.ACCEPT_CONFESS_USER_ID,
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
f.ANALYZE_TIME
f.ANALYZE_TIME,
f.CONFIRM_OTHER_CONTENT
</sql>
<!-- 字段用于新增 -->
@ -167,7 +168,8 @@
ACCEPT_CONFESS_USER_ID,
ACCEPT_CONFESS_USER_SIGNER_PATH,
ACCEPT_CONFESS_USER_SIGNER_TIME,
ANALYZE_TIME
ANALYZE_TIME,
CONFIRM_OTHER_CONTENT
</sql>
<!-- 字段值 -->
@ -246,7 +248,8 @@
#{ACCEPT_CONFESS_USER_ID},
#{ACCEPT_CONFESS_USER_SIGNER_PATH},
#{ACCEPT_CONFESS_USER_SIGNER_TIME},
#{ANALYZE_TIME}
#{ANALYZE_TIME},
#{CONFIRM_OTHER_CONTENT}
</sql>
<!-- 新增-->
@ -355,6 +358,7 @@
ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
CONFIRM_OTHER_CONTENT = #{CONFIRM_OTHER_CONTENT},
HOTWORK_ID = HOTWORK_ID
where
HOTWORK_ID = #{HOTWORK_ID}
@ -542,6 +546,7 @@
f.ACCEPT_CONFESS_USER_SIGNER_PATH,
f.ACCEPT_CONFESS_USER_SIGNER_TIME,
f.HOTWORK_ID,
f.CONFIRM_OTHER_CONTENT,
ad.NAME as APPLY_DEPARTMENT_NAME,
au.NAME as APPLY_USER_NAME,

31
src/main/resources/mybatis/dsno2/map/MeteorologicalinfoMapper.xml
View File

@ -512,22 +512,25 @@
</select>
<select id="listbymeteorologicalByCodes" resultType="pd" parameterType="pd">
SELECT
f.TEMPERATURE,
f.HUMIDITY,
f.WINDDIRECTION,
f.WINDSPEED,
f.ISDELETE,
f.OPERATTIME,
f.METEOROLOGICAL_ID,
f.METEOROLOGICALINFO_ID,
f.OPERATOR,
f.CODE
f.TEMPERATURE,
f.HUMIDITY,
f.WINDDIRECTION,
f.WINDSPEED,
f.ISDELETE,
f.OPERATTIME,
f.METEOROLOGICAL_ID,
f.METEOROLOGICALINFO_ID,
f.OPERATOR,
f.CODE
FROM
bus_meteorologicalinfo f
bus_meteorologicalinfo f
WHERE 1=1
and f.code in ( #{codes})
and f.code in
<foreach item="item" index="index" collection="codes" open="(" separator="," close=")">
#{item}
</foreach>
ORDER BY
f.OPERATTIME DESC
LIMIT 1 ;
f.OPERATTIME DESC
LIMIT 1
</select>
</mapper>