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

重点工程流程完善

pull/14/head
dearlin 2023-12-29 11:05:41 +08:00
parent 0e778fd1d9
commit cb54c67d4e
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java
View File

@ -806,6 +806,7 @@ public class OutSourcedController extends BaseController {
*/ */
@RequestMapping(value = "/updateState") @RequestMapping(value = "/updateState")
@ResponseBody @ResponseBody
@DockAnnotation
public Object updateState() throws Exception { public Object updateState() throws Exception {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success"; String errInfo = "success";
@ -813,6 +814,7 @@ public class OutSourcedController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
outsourcedService.updateState(pd); outsourcedService.updateState(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd)); //返回结果
return map; return map;
} }

1
src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java
View File

@ -125,6 +125,7 @@ public class AppKeyprojectCheckController extends BaseController {
hiddenList.add(hidden); hiddenList.add(hidden);
time = DateUtil.calculateDateSecond(time, 1); time = DateUtil.calculateDateSecond(time, 1);
} }
pd.put("hiddenList", hiddenList);
} }
try { try {

2
src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java
View File

@ -103,8 +103,8 @@ public class AppKeyprojectPunishController extends BaseController {
e.printStackTrace(); e.printStackTrace();
}finally { }finally {
map.put("result", errInfo); map.put("result", errInfo);
}
map.put("dockData", JSON.toJSONString(pd)); map.put("dockData", JSON.toJSONString(pd));
}
return map; return map;
} }

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

@ -58,18 +58,18 @@ qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
#preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ #preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
#qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/ #qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/
#????? #?????
smb.host=39.103.224.166 smb.host=39.101.130.96
smb.port=22 smb.port=22
smb.user=root smb.user=root
smb.password=Zcloud@zcloud88888 smb.password=Zcloud@zcloud88888
smb.basePath=/mnt/qgfile/file/ smb.basePath=/mnt/wwag/file/
#Mq\u914D\u7F6E #Mq\u914D\u7F6E
rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group2=edu-admin-edit
rocketmq.consumer.group1=edu-admin-add rocketmq.consumer.group1=edu-admin-add
#rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=10.0.140.141:9876
#rocketmq.name-server=192.168.0.70:9876 #rocketmq.name-server=192.168.0.70:9876
rocketmq.name-server=192.168.0.31:9876 rocketmq.name-server=192.168.0.79:9876
rocketmq.producer.group=libmiddle rocketmq.producer.group=libmiddle
rocketmq.producer.send-message-timeout=3000 rocketmq.producer.send-message-timeout=3000
rocketmq.producer.compress-message-body-threshold=4096 rocketmq.producer.compress-message-body-threshold=4096