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

feat:八项作业撤回上一步

0927cmt
dearLin 2024-12-13 13:50:03 +08:00
parent 05a14e2efc
commit f7177dd91d
5 changed files with 1416 additions and 1432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java
View File

@ -34,7 +34,9 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
@Resource
private GFConfinedSpaceGasWHService GFconfinedspacegaswhService;
/**新增
/**
* 新增
*
* @param
* @throws Exception
*/
@ -70,7 +72,9 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
return map;
}
/**删除
/**
* 删除
*
* @param
* @throws Exception
*/
@ -93,7 +97,9 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
return map;
}
/**修改
/**
* 修改
*
* @param
* @throws Exception
*/
@ -117,7 +123,9 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
return map;
}
/**列表
/**
* 列表
*
* @param page
* @throws Exception
*/
@ -138,7 +146,9 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
return map;
}
/**去修改页面获取数据
/**
* 去修改页面获取数据
*
* @param
* @throws Exception
*/
@ -155,7 +165,9 @@ public class AppGFConfinedSpaceGasWHController extends BaseController {
return map;
}
/**批量删除
/**
* 批量删除
*
* @param
* @throws Exception
*/

119
src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java
View File

@ -53,7 +53,9 @@ public class AppGFElectricityController extends BaseController {
@Resource
private SendMessageService mqClient;
/**获取编码
/**
* 获取编码
*
* @param
* @throws Exception
*/
@ -78,7 +80,9 @@ public class AppGFElectricityController extends BaseController {
return map;
}
/**新增
/**
* 新增
*
* @param
* @throws Exception
*/
@ -193,7 +197,8 @@ public class AppGFElectricityController extends BaseController {
return map;
}
/**删除
/**
* 删除
*/
@RequestMapping(value = "/delete")
@ResponseBody
@ -214,7 +219,9 @@ public class AppGFElectricityController extends BaseController {
return map;
}
/**修改
/**
* 修改
*
* @param
* @throws Exception
*/
@ -292,7 +299,10 @@ public class AppGFElectricityController extends BaseController {
map.put("result", errInfo);
return map;
}
/**修改
/**
* 修改
*
* @param
* @throws Exception
*/
@ -300,9 +310,7 @@ public class AppGFElectricityController extends BaseController {
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editGuardian(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
public Object editGuardian(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
@ -341,7 +349,9 @@ public class AppGFElectricityController extends BaseController {
return map;
}
/**修改
/**
* 修改
*
* @param
* @throws Exception
*/
@ -349,9 +359,7 @@ public class AppGFElectricityController extends BaseController {
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editConfess(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
public Object editConfess(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
@ -390,7 +398,9 @@ public class AppGFElectricityController extends BaseController {
return map;
}
/**修改
/**
* 修改
*
* @param
* @throws Exception
*/
@ -423,9 +433,7 @@ public class AppGFElectricityController extends BaseController {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file" + i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),
pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),
pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList,saveImgMap,count);
saveImg(fileList.toArray(fileArr), signertime, pd.getString("ELECTRICITY_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_CONFESS_USER_ID"), pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"), pictureList, saveImgMap, count);
fileList.clear();
count += 1;
}
@ -435,10 +443,8 @@ public class AppGFElectricityController extends BaseController {
map.put("result", errInfo);
return map;
}
private void saveImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID,
String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID,
String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList,
Map<String,String> saveImgMap,int count) throws Exception{
private void saveImg(MultipartFile[] files, String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList<String> pictureList, Map<String, String> saveImgMap, int count) throws Exception {
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData pd = new PageData();
@ -466,7 +472,10 @@ public class AppGFElectricityController extends BaseController {
}
}
}
/**修改
/**
* 修改
*
* @param
* @throws Exception
*/
@ -498,8 +507,7 @@ public class AppGFElectricityController extends BaseController {
// map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
if ("2".equals(status) || "3".equals(status) || "4".equals(status)) {
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
pd.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
} else if ("-2".equals(status) || "-3".equals(status) || "-4".equals(status) || "-5".equals(status)) {
@ -521,9 +529,7 @@ public class AppGFElectricityController extends BaseController {
signertime = SIGNTIME[i];
fileList.add(request.getFile("file" + i));
MultipartFile[] fileArr = new MultipartFile[fileList.size()];
saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),
pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),
pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList,saveAcceptImgMap,count);
saveAcceptImg(fileList.toArray(fileArr), signertime, pd.getString("ELECTRICITY_ID"), pd.getString("CORPINFO_ID"), pd.getString("ACCEPT_USER_ID"), pd.getString("ACCEPT_DEPARTMENT_ID"), pictureList, saveAcceptImgMap, count);
fileList.clear();
count++;
}
@ -607,9 +613,7 @@ public class AppGFElectricityController extends BaseController {
return map;
}
private void saveAcceptImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID,
String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID,
ArrayList<String> pictureList,Map<String,String> saveAcceptImgMap,int count) throws Exception{
private void saveAcceptImg(MultipartFile[] files, String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList<String> pictureList, Map<String, String> saveAcceptImgMap, int count) throws Exception {
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
PageData cpd = new PageData();
@ -639,7 +643,9 @@ public class AppGFElectricityController extends BaseController {
}
/**修改
/**
* 修改
*
* @param
* @throws Exception
*/
@ -647,9 +653,7 @@ public class AppGFElectricityController extends BaseController {
@ResponseBody
@Transactional
@DockAnnotation(hasAnnex = true)
public Object editStatus(
@RequestParam(value="FFILE",required=false) MultipartFile[] files
) throws Exception{
public Object editStatus(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
@ -673,8 +677,7 @@ public class AppGFElectricityController extends BaseController {
// map.put("dockData", JSON.toJSONString(pd));
String status = pd.get("STATUS").toString();
if ("2".equals(status) || "3".equals(status) || "4".equals(status)) {
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
pd.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES);
} else if ("-2".equals(status) || "-3".equals(status) || "-4".equals(status) || "-5".equals(status)) {
@ -1080,7 +1083,10 @@ public class AppGFElectricityController extends BaseController {
map.put("result", errInfo);
return map;
}
/**列表
/**
* 列表
*
* @param page
* @throws Exception
*/
@ -1100,7 +1106,10 @@ public class AppGFElectricityController extends BaseController {
map.put("result", errInfo);
return map;
}
/**列表
/**
* 列表
*
* @param page
* @throws Exception
*/
@ -1120,7 +1129,10 @@ public class AppGFElectricityController extends BaseController {
map.put("result", errInfo);
return map;
}
/**列表
/**
* 列表
*
* @param page
* @throws Exception
*/
@ -1140,7 +1152,10 @@ public class AppGFElectricityController extends BaseController {
map.put("result", errInfo);
return map;
}
/**列表
/**
* 列表
*
* @param page
* @throws Exception
*/
@ -1161,9 +1176,11 @@ public class AppGFElectricityController extends BaseController {
return map;
}
/**作废
* @paramout
/**
* 作废
*
* @throws Exception
* @paramout
*/
@PostMapping(value = "/cancel")
@ResponseBody
@ -1270,7 +1287,9 @@ public class AppGFElectricityController extends BaseController {
return;
}
/**去修改页面获取数据
/**
* 去修改页面获取数据
*
* @param
* @throws Exception
*/
@ -1291,7 +1310,9 @@ public class AppGFElectricityController extends BaseController {
return map;
}
/**去修改页面获取数据
/**
* 去修改页面获取数据
*
* @param
* @throws Exception
*/
@ -1308,7 +1329,9 @@ public class AppGFElectricityController extends BaseController {
return map;
}
/**去修改页面获取数据
/**
* 去修改页面获取数据
*
* @param
* @throws Exception
*/
@ -1331,7 +1354,9 @@ public class AppGFElectricityController extends BaseController {
return map;
}
/**去修改页面获取数据
/**
* 去修改页面获取数据
*
* @param
* @throws Exception
*/
@ -1357,7 +1382,9 @@ public class AppGFElectricityController extends BaseController {
return map;
}
/**待办作业数统计
/**
* 待办作业数统计
*
* @param
* @throws Exception
*/

4
src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java
View File

@ -591,8 +591,8 @@ public class AppGFHighWorkController extends BaseController {
String status = pd.get("STATUS").toString();
String OTHER_PROTECTIVE_MEASURES = pd2.getString("OTHER_PROTECTIVE_MEASURES");
if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status)) {
OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
(StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES"))
? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;");
// pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") +
// (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"));
// pd2.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") +

2
src/main/resources/config/sysSet.ini
View File

@ -7,7 +7,7 @@ showCount=10
;在线管理IP
onlineIp=127.0.0.1
;在线管理端口
onlinePort=8869
onlinePort=18869
;信息提示音
fhsmsSound=m1

55
src/main/test/Test.java
View File

@ -1,55 +0,0 @@
import com.alibaba.fastjson.JSONObject;
import com.zcloud.util.HttpRequestUtil;
import com.zcloud.util.Tools;
public class Test {
private static String username = "qinan";
private static String password = "ZBo7pZ6UKDGLXq/xc87WB/J84jk0B7jpujsQZFcGbG4NrNN0CuWSiImfNln0nloVYC0BOp+9bnCq7MEFpzJXy11z2iYnlOA8B7MM5YDi2dpI+bHO0+lfL57eH6IXP7rrSjiKWCBDjNPgYGETkSgXNRVb8L9LnwX6qbHDri4ARTI=";
private static String userName = "n3Q3nVlzQ/8wVC0CObso2H+i8Y3g8q7k0DGZrZY4ofqnAv1wgfFst7AnlTYu7Rw1aJv36cPD/nrWARmNqP+UghX17K5iutwmKLVwC4EZaVmVABQGLjYdCekj2ePHpGjDFyHYaGQrIVJ651WxFZfKtdBexSL7b9sm7FRbpievNmA=";
private static String source = "API";
private static String code = "1";
private static String perLocToken = "4b13428cadd8bafbf9ae7ae2544";
private static String perLocUrl = "http://172.16.130.86/gateway-service";
public static void main(String[] args) throws Exception {
getToken();
}
public static String goToLogin() {
JSONObject request = new JSONObject();
request.put("username", username);
request.put("password", password);
request.put("userName", userName);
request.put("source", source);
request.put("code", code);
String loginResStr = HttpRequestUtil.doPost("http://172.16.130.86/gateway-service" + "/auth/encryptLogin", request.toJSONString());
JSONObject loginResponse = JSONObject.parseObject(loginResStr);
if(Tools.notEmpty(loginResStr) && loginResponse != null
&& loginResponse.get("code") != null && loginResponse.getInteger("code") == 200
&& loginResponse.get("data") != null && loginResponse.getJSONObject("data").getString("token") != null){
return loginResponse.getJSONObject("data").getString("token");
} else { // 登录失败
throw new RuntimeException("人员定位第三方登录失败");
}
}
public static String getToken() throws Exception {
// token 不为空。验证token是否失效
if (Tools.notEmpty(perLocToken)) {
JSONObject request = new JSONObject();
request.put("pageNum", 1);
request.put("pageSize", 10);
String httpResponseStr = HttpRequestUtil.doPost(perLocToken, perLocUrl + "/system/menu/menuTree",request.toJSONString());
JSONObject httpResponse = JSONObject.parseObject(httpResponseStr);
// token 有效
if (Tools.notEmpty(httpResponseStr) && httpResponse != null && httpResponse.get("code") != null && httpResponse.getInteger("code") == 200) {
return perLocToken;
} else { // token 失效 或者报错
perLocToken = goToLogin();
}
} else {
perLocToken = goToLogin();
}
return perLocToken;
}
}