对接代码dockData补充

pull/14/head
songwenxuan 2023-12-29 11:26:41 +08:00
parent f36417ce03
commit c81dd7dcbd
14 changed files with 33 additions and 9 deletions

View File

@ -193,8 +193,6 @@ public class CorpInfoController extends BaseController {
PageData userInfo = usersService.findByCorpInfoId(pd); PageData userInfo = usersService.findByCorpInfoId(pd);
pdNew.put("USER_ID", userInfo.getString("USER_ID")); pdNew.put("USER_ID", userInfo.getString("USER_ID"));
pdNew.put("DEPARTMENT_ID", userInfo.getString("DEPARTMENT_ID")); pdNew.put("DEPARTMENT_ID", userInfo.getString("DEPARTMENT_ID"));
//新增变量添加参数 根据原名称修改数据 //新增变量添加参数 根据原名称修改数据
pdNew.put("OLDNAME",pdOld.get("CORP_NAME")); pdNew.put("OLDNAME",pdOld.get("CORP_NAME"));
pdNew.put("USERNAME",pd.getString("CORP_NAME")); pdNew.put("USERNAME",pd.getString("CORP_NAME"));
@ -202,8 +200,7 @@ public class CorpInfoController extends BaseController {
pdNew.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("CORP_NAME"), Const.DEFAULT_PASSWORD).toString()); //密码加密 pdNew.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("CORP_NAME"), Const.DEFAULT_PASSWORD).toString()); //密码加密
corpinfoService.editCorpUserNew(pdNew); corpinfoService.editCorpUserNew(pdNew);
corpinfoService.editCorpdeptNew(pdNew); corpinfoService.editCorpdeptNew(pdNew);
map.put("dockData","对接接口");
return map; return map;
} }
@RequestMapping(value="/editIsReceive") @RequestMapping(value="/editIsReceive")
@ -373,7 +370,7 @@ public class CorpInfoController extends BaseController {
updateUser.put("PASSWORD", pwd); updateUser.put("PASSWORD", pwd);
updateUser.put("USER_ID", pageData.getString("USER_ID")); updateUser.put("USER_ID", pageData.getString("USER_ID"));
usersService.editPassword(updateUser); usersService.editPassword(updateUser);
map.put("dockData","对接接口");
map.put("result", errInfo); map.put("result", errInfo);
return map; return map;
} }

View File

@ -408,6 +408,7 @@ public class HiddenController extends BaseController {
applicationContext.publishEvent(new DeviceHiddenEvent(new Object(), pd.getString("HIDDEN_ID"), "1")); applicationContext.publishEvent(new DeviceHiddenEvent(new Object(), pd.getString("HIDDEN_ID"), "1"));
FHLOG.save(Jurisdiction.getName(), "删除隐患ID:" + pd.getString("HIDDEN_ID"), ip); //记录日志 用户ID 隐患id 时间 FHLOG.save(Jurisdiction.getName(), "删除隐患ID:" + pd.getString("HIDDEN_ID"), ip); //记录日志 用户ID 隐患id 时间
map.put("result", errInfo); // 返回结果 map.put("result", errInfo); // 返回结果
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }
@ -2111,6 +2112,7 @@ public class HiddenController extends BaseController {
} }
map.put("pd", pd); map.put("pd", pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }

View File

@ -147,6 +147,7 @@ public class IdentificationPartsController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
identificationpartsService.delete(pd); identificationpartsService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData","对接接口");
return map; return map;
} }
@ -167,6 +168,7 @@ public class IdentificationPartsController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
identificationpartsService.edit(pd); identificationpartsService.edit(pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }

View File

@ -493,6 +493,7 @@ public class ListManagerController extends BaseController {
} }
// 将本频率内已检查的记录,改为不计入 // 将本频率内已检查的记录,改为不计入
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }
@ -1082,6 +1083,7 @@ public class ListManagerController extends BaseController {
errInfo = "fail"; errInfo = "fail";
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }

View File

@ -98,6 +98,7 @@ public class QualificationsController extends BaseController {
} }
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }
@ -119,6 +120,7 @@ public class QualificationsController extends BaseController {
qualificationsService.edit(pd); qualificationsService.edit(pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("pd", pd); map.put("pd", pd);
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }

View File

@ -7,6 +7,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation; import com.zcloud.aspect.DockAnnotation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -90,6 +91,7 @@ public class RiskCheckItemController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
riskcheckitemService.edit(pd); riskcheckitemService.edit(pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }

View File

@ -200,6 +200,7 @@ public class RiskPointController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
riskpointService.delete(pd); riskpointService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }
@ -221,6 +222,7 @@ public class RiskPointController extends BaseController {
riskToUserService.delete(pd); riskToUserService.delete(pd);
if(pd.get("OTHER")!=null && !pd.get("OTHER").equals("")) { if(pd.get("OTHER")!=null && !pd.get("OTHER").equals("")) {
List<JSONObject> list = (List<JSONObject>)JSON.parse(pd.get("OTHER").toString()); List<JSONObject> list = (List<JSONObject>)JSON.parse(pd.get("OTHER").toString());
ArrayList<PageData> arrayList = new ArrayList<>();
for (JSONObject json : list) { for (JSONObject json : list) {
if(json.get("DEPARTMENT_ID")!=null && json.get("DEPARTMENT_ID")!="" && json.get("USER_ID")!=null && json.get("USER_ID")!="") { if(json.get("DEPARTMENT_ID")!=null && json.get("DEPARTMENT_ID")!="" && json.get("USER_ID")!=null && json.get("USER_ID")!="") {
PageData other = new PageData(); PageData other = new PageData();
@ -228,10 +230,11 @@ public class RiskPointController extends BaseController {
other.put("RISKPOINT_ID", pd.get("RISKPOINT_ID")); other.put("RISKPOINT_ID", pd.get("RISKPOINT_ID"));
other.put("DEPARTMENT_ID",json.get("DEPARTMENT_ID")); other.put("DEPARTMENT_ID",json.get("DEPARTMENT_ID"));
other.put("USER_ID",json.get("USER_ID")); other.put("USER_ID",json.get("USER_ID"));
arrayList.add(other);
riskToUserService.save(other); riskToUserService.save(other);
} }
} }
pd.put("arrayList",JSON.toJSONString(arrayList));
} }
// 修改冗余字段检查内容 // 修改冗余字段检查内容
PageData pd2 = new PageData(); PageData pd2 = new PageData();
@ -239,6 +242,7 @@ public class RiskPointController extends BaseController {
pd2.put("RISKPOINT_ID", pd.get("RISKPOINT_ID")); pd2.put("RISKPOINT_ID", pd.get("RISKPOINT_ID"));
riskcheckitemService.editByPoint(pd2); riskcheckitemService.editByPoint(pd2);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }
@ -424,6 +428,7 @@ public class RiskPointController extends BaseController {
errInfo = "fail"; errInfo = "fail";
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }

View File

@ -155,6 +155,7 @@ public class RiskUnitController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
riskunitService.delete(pd); riskunitService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
pd.put("dockData",JSON.toJSONString(pd));
return map; return map;
} }
@ -183,6 +184,7 @@ public class RiskUnitController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
riskunitService.edit(pd); riskunitService.edit(pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData","对接接口");
return map; return map;
} }

View File

@ -108,6 +108,7 @@ public class RiskWarningController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
riskwarningService.delete(pd); riskwarningService.delete(pd);
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }

View File

@ -118,6 +118,7 @@ public class MfolderController extends BaseController {
errInfo = "fail"; errInfo = "fail";
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }
@ -252,6 +253,7 @@ public class MfolderController extends BaseController {
errInfo = "fail"; errInfo = "fail";
map.put("result", "errInfo"); //返回结果 map.put("result", "errInfo"); //返回结果
map.put("msg","文件夹下有文件,请先删除文件夹中文件"); map.put("msg","文件夹下有文件,请先删除文件夹中文件");
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
}else{ }else{
if(Tools.notEmpty(FILEPATH)){ if(Tools.notEmpty(FILEPATH)){
@ -262,6 +264,7 @@ public class MfolderController extends BaseController {
map.put("dockData", JSON.toJSONString(pd)); //返回结果 map.put("dockData", JSON.toJSONString(pd)); //返回结果
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }

View File

@ -475,6 +475,7 @@ public class SafetyEnvironmentalController extends BaseController {
pd.put("hide", "1"); pd.put("hide", "1");
safetyenvironmentalService.delete(pd); safetyenvironmentalService.delete(pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map; return map;
} }

View File

@ -184,7 +184,7 @@ public class DepartmentController extends BaseController {
} else { } else {
departmentService.delete(pd); //执行删除 departmentService.delete(pd); //执行删除
} }
map.put("dockData","对接接口");
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
return map; return map;
} }
@ -250,6 +250,7 @@ public class DepartmentController extends BaseController {
} }
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData","对接接口");
return map; return map;
} }
@ -599,8 +600,8 @@ public class DepartmentController extends BaseController {
return map; return map;
} }
departmentService.editByLeaderOrCharge(goEditPd); departmentService.editByLeaderOrCharge(goEditPd);
map.put("result", "success"); map.put("result", "success");
map.put("dockData","对接接口");
return map; return map;
} }

View File

@ -87,6 +87,7 @@ public class PostController extends BaseController {
postService.delete(pd); postService.delete(pd);
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData","对接接口");
return map; return map;
} }
@ -105,6 +106,7 @@ public class PostController extends BaseController {
pd = this.getPageData(); pd = this.getPageData();
postService.edit(pd); postService.edit(pd);
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData","对接接口");
return map; return map;
} }

View File

@ -506,6 +506,7 @@ public class UsersController extends BaseController {
pd = usersService.findById(pd); //根据ID读取 pd = usersService.findById(pd); //根据ID读取
map.put("result", errInfo); map.put("result", errInfo);
map.put("pd", pd); map.put("pd", pd);
map.put("dockData","对接接口");
return map; return map;
} }
@ -777,6 +778,7 @@ public class UsersController extends BaseController {
} }
map.put("result", errInfo); map.put("result", errInfo);
map.put("dockData","对接接口");
return map; return map;
} }
@ -1132,8 +1134,8 @@ public class UsersController extends BaseController {
} }
} }
} }
map.put("result", errInfo); //返回结果 map.put("result", errInfo); //返回结果
map.put("dockData","对接接口");
return map; return map;
} }