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

Merge remote-tracking branch 'origin/czks1.0' into czks1.0

pull/14/head
dearlin 2023-12-25 14:42:58 +08:00
parent 87aee42fdb 696c3eab44
commit 9fd3b521c0
43 changed files with 748 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zcloud/aspect/DockingAspect.java
View File

@ -3,12 +3,15 @@ package com.zcloud.aspect;
import com.alibaba.fastjson.JSON;
import com.zcloud.dto.TenCorpDto;
import com.zcloud.entity.PageData;
import com.zcloud.entity.system.User;
import com.zcloud.service.docking.DockingRelationService;
import com.zcloud.service.mq.DockSendMessageService;
import com.zcloud.service.mq.SendMessageService;
import com.zcloud.util.Const;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Tools;
import com.zcloud.util.UuidUtil;
import org.apache.shiro.session.Session;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@ -164,6 +167,10 @@ public class DockingAspect {
login_user.put("NAME", Jurisdiction.getName());
login_user.put("ISSUPERVISE", Jurisdiction.getISSUPERVISE());
login_user.put("POST_ID", Jurisdiction.getPOST_ID());
login_user.put("IS_MAIN", Jurisdiction.getIS_MAIN());
Session session = Jurisdiction.getSession();
User user = (User)session.getAttribute(Const.SESSION_USER);
login_user.put("user",JSON.toJSONString(user));
sendData.put("LOGIN_USER", login_user);
} else {
// 手机app 会传递值。

9
src/main/java/com/zcloud/controller/app/AppCheckRecordController.java
View File

@ -1,11 +1,13 @@
package com.zcloud.controller.app;
import java.sql.Array;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.service.bus.*;
import com.zcloud.util.*;
import com.zcloud.util.message.MessageService;
@ -77,6 +79,7 @@ public class AppCheckRecordController extends BaseController {
@RequestMapping(value = "/add")
@ResponseBody
@Transactional
@DockAnnotation
public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -134,6 +137,7 @@ public class AppCheckRecordController extends BaseController {
hiddenService.updateAll(hiddens);
}
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -146,6 +150,7 @@ public class AppCheckRecordController extends BaseController {
@RequestMapping(value = "/finish")
@ResponseBody
@Transactional
@DockAnnotation
public Object finish() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -199,6 +204,7 @@ public class AppCheckRecordController extends BaseController {
checkuserService.delete(pd);
if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) {
List<JSONObject> list1 = (List<JSONObject>) JSON.parse(pd.get("OTHER").toString());
ArrayList<PageData> otherList = new ArrayList<>();
for (JSONObject json : list1) {
if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null
&& json.get("USER_ID") != "") {
@ -207,9 +213,11 @@ public class AppCheckRecordController extends BaseController {
other.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID"));
other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID"));
other.put("USER_ID", json.get("USER_ID"));
otherList.add(other);
checkuserService.save(other);
}
}
pd.put("otherList", otherList);
}
hiddenService.submit(pd);// 清单内隐患提交
hiddenService.submitList(pd);// 其他隐患提交
@ -226,6 +234,7 @@ public class AppCheckRecordController extends BaseController {
}
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}

32
src/main/java/com/zcloud/controller/app/AppHiddenController.java
View File

@ -22,6 +22,7 @@ import com.zcloud.util.*;
import com.zcloud.util.event.DeviceHiddenEvent;
import com.zcloud.util.message.MessageService;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.crypto.hash.Hash;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Controller;
@ -263,6 +264,7 @@ public class AppHiddenController extends BaseController {
*/
@RequestMapping(value = "/add")
@ResponseBody
@DockAnnotation
public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -292,7 +294,9 @@ public class AppHiddenController extends BaseController {
pd.put("RISK_POSITION", item.get("POSITIONNAME"));
pd.put("LEVEL", item.get("DNAME5"));
}
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("other").toString()); // 隐患发现人
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("other").toString()); // 隐患发现
HashMap<String, String> hiddenconUserMap = new HashMap<>();
int count = 1;
for (JSONObject json : list) {
PageData hiddenconUserAdd = new PageData();
hiddenconUserAdd.put("HIDDENUSER_ID", UuidUtil.get32UUID());
@ -300,8 +304,11 @@ public class AppHiddenController extends BaseController {
hiddenconUserAdd.put("USER_ID", json.get("USER_ID"));
hiddenconUserAdd.put("TYPE", "1");
hiddenconUserAdd.put("IS_MAIN", "0");
hiddenconUserMap.put("hiddenconUser"+count,JSON.toJSONString(hiddenconUserAdd));
count++;
hiddenUserService.save(hiddenconUserAdd); // 添加隐患发现人
}
pd.put("hiddenconUserMap",JSON.toJSONString(hiddenconUserMap));
if (pd.getString("HIDDENLEVEL").equals("jdyh001") || pd.getString("HIDDENLEVEL").equals("hiddenLevel2002")) {//判断是否是重大隐患
PageData userpd = new PageData();
userpd.put("USER_ID", pd.getString("CREATOR"));
@ -344,7 +351,8 @@ public class AppHiddenController extends BaseController {
before.put("spare4", pd.getString("RECTIFICATIONDEPT"));
before.put("CREATOR", pd.getString("loginUserId"));
before.put("OPERATOR", pd.getString("loginUserId"));
hiddenExamineService.saveApp(before);
PageData pageData = hiddenExamineService.saveApp(before);
pd.put("examine", JSON.toJSONString(pageData));
hiddenService.save(pd);
if (!pd.getString("STATE").equals("0")) {
messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患需要确认", pd.getString("CORPINFO_ID"), pd.getString("CONFIRM_USER"), pd.getString("HIDDEN_ID"),
@ -364,10 +372,10 @@ public class AppHiddenController extends BaseController {
imgFilesService.delete(i);
}
}
}
map.put("result", errInfo);
map.put("pd", pd);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -412,7 +420,8 @@ public class AppHiddenController extends BaseController {
before.put("spare4", pd.getString("RECTIFICATIONDEPT"));
before.put("CREATOR", pd.getString("loginUserId"));
before.put("OPERATOR", pd.getString("loginUserId"));
hiddenExamineService.saveApp(before);
PageData hiddenExamine = hiddenExamineService.saveApp(before);
pd.put("hiddenExamine", JSON.toJSONString(hiddenExamine));
PageData hiddenExaminePageData = new PageData();
hiddenExaminePageData.putAll(before);
@ -955,6 +964,7 @@ public class AppHiddenController extends BaseController {
@RequestMapping(value = "/rectify")
@ResponseBody
@Transactional
@DockAnnotation
public Object rectify() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -989,6 +999,7 @@ public class AppHiddenController extends BaseController {
if (pd.get("OTHER") != null && !pd.get("OTHER").equals("")) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("OTHER").toString());
List<PageData> otherList = new ArrayList<>();
for (JSONObject json : list) {
// if (json.get("DEPARTMENT_ID") != null && json.get("DEPARTMENT_ID") != "" && json.get("USER_ID") != null
// && json.get("USER_ID") != "") {
@ -999,6 +1010,7 @@ public class AppHiddenController extends BaseController {
other.put("DEPARTMENT_ID", json.get("DEPARTMENT_ID"));
other.put("USER_ID", json.get("USER_ID"));
other.put("STATUS", "0");
otherList.add(other);
hiddenCheckService.save(other);
PageData hiddenPd = hiddenService.findById(pd);
messageService.sendMessageByParameter("HIDDEN_MAIL_004", "友情提示：有一条隐患需要验收",
@ -1006,9 +1018,11 @@ public class AppHiddenController extends BaseController {
hiddenPd.getString("HIDDENDESCR"), "隐患验收", "验收", "", "");
}
}
pd.put("otherList",JSON.toJSONString(otherList));
}
map.put("result", errInfo);
map.put("HIDDENSCHEME_ID", pd.get("HIDDENSCHEME_ID"));
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -1068,6 +1082,7 @@ public class AppHiddenController extends BaseController {
*/
@RequestMapping(value = "/check")
@ResponseBody
@DockAnnotation
public Object check() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -1141,11 +1156,13 @@ public class AppHiddenController extends BaseController {
/** 验收打回 **/
hiddenApiService.repulseCheck(pd.getString("HIDDEN_ID"));
/** 记录打回 **/
hiddenExamineApiService.saveRepulseCheckApp(pd.getString("HIDDEN_ID"), pd.getString("CONTENT"), pd.getString("CHECKOR"));
PageData pageData = hiddenExamineApiService.saveRepulseCheckApp(pd.getString("HIDDEN_ID"), pd.getString("CONTENT"), pd.getString("CHECKOR"));
pd.put("pageData", JSON.toJSONString(pageData));
}
hiddenMailService.apphiddneCheckAdopt(pd);
map.put("check", pd);
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -1470,6 +1487,7 @@ public class AppHiddenController extends BaseController {
*/
@RequestMapping(value = "/confirm")
@ResponseBody
@DockAnnotation
public Object confirmUpdate() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -1626,6 +1644,7 @@ public class AppHiddenController extends BaseController {
*/
@RequestMapping(value = "/assign")
@ResponseBody
@DockAnnotation
public Object assign() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -1667,6 +1686,7 @@ public class AppHiddenController extends BaseController {
*/
@RequestMapping(value = "/finalcheck")
@ResponseBody
@DockAnnotation
public Object finalcheck() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -1738,6 +1758,7 @@ public class AppHiddenController extends BaseController {
@RequestMapping(value = "/repulseHidden")
//@RequiresPermissions("hidden:edit")
@ResponseBody
@DockAnnotation
public Object repulseHidden() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -1750,6 +1771,7 @@ public class AppHiddenController extends BaseController {
hiddenExamineService.saverepulse(pd);
hiddenMailService.reject(pd);
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}

7
src/main/java/com/zcloud/controller/app/AppHiddenExamineController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.app;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -216,6 +218,7 @@ public class AppHiddenExamineController extends BaseController {
*/
@RequestMapping(value = "/delayedExamine")
@ResponseBody
@DockAnnotation
public Object delayedExamine() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -263,6 +266,7 @@ public class AppHiddenExamineController extends BaseController {
@RequestMapping(value = "/delayed")
@ResponseBody
@Transactional
@DockAnnotation
public Object delayed(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -292,6 +296,7 @@ public class AppHiddenExamineController extends BaseController {
pd.put("CREATOR", pd.getString("loginUserId"));
pd.put("OPERATOR",pd.getString("loginUserId"));
examine = hiddenexamineService.saveApp(examine);
pd.put("examine", JSON.toJSONString(examine));
PageData hiddenpd = hiddenService.findById(pd);
messageService.sendMessageByParameter("HIDDEN_MAIL_007","友情提示：有一条隐患需要延期审核",
hiddenpd.getString("CORPINFO_ID"),hiddenpd.getString("CONFIRM_USER"),hiddenpd.getString("HIDDEN_ID"),
@ -300,6 +305,7 @@ public class AppHiddenExamineController extends BaseController {
map.put("result", errInfo);
map.put("msg", "隐患延期申成功。请通知隐患确认人进行延期确认操作！");
map.put("dockData",JSON.toJSONString(pd));
return map;
}
/**
@ -345,6 +351,7 @@ public class AppHiddenExamineController extends BaseController {
*/
@RequestMapping(value = "/specialExamine")
@ResponseBody
@DockAnnotation
public Object specialExamine(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";

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

@ -51,6 +51,7 @@ public class AppImgFilesController extends BaseController {
@RequestMapping(value = "/add", headers = "content-type=multipart/form-data")
@ResponseBody
@Transactional
// @DockAnnotation(hasAnnex = true)
public Object finish(
@RequestParam(value = "FFILE", required = false) MultipartFile[] files,
@RequestParam(value = "TYPE", required = false) String TYPE,

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

@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.zcloud.aspect.DockAnnotation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -86,6 +87,7 @@ public class AppRiskPointController extends BaseController{
*/
@RequestMapping(value="/editLonAndLat")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";

11
src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.app.inspection;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -85,6 +87,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
*/
@RequestMapping(value="/add")
@ResponseBody
@DockAnnotation
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception {
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -118,6 +121,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
pd.put("hiddenList", hiddenList);
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -163,6 +167,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
*/
@RequestMapping(value="/edit")
@ResponseBody
@DockAnnotation
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -191,6 +196,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
pd.put("hiddenList", hiddenList);
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -201,6 +207,7 @@ public class AppSafetyEnvironmentalController extends BaseController {
@RequestMapping(value="/explain")
//@RequiresPermissions("safetyenvironmental:edit")
@ResponseBody
@DockAnnotation
public Object explain(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -222,11 +229,13 @@ public class AppSafetyEnvironmentalController extends BaseController {
pd.put("INSPECTION_ORIGINATOR_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
}
safetyenvironmentalService.explain(pd);
PageData log = safetyenvironmentalService.explain(pd);
pd.put("log",JSON.toJSONString(log));
pd.put("inspector",pd.getString("OPERATOR"));
noticeCorpUtil.FailPleadind(pd);
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}

7
src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalExplainController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.app.inspection;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -78,6 +80,7 @@ public class AppSafetyEnvironmentalExplainController extends BaseController {
*/
@RequestMapping(value = "/add")
@ResponseBody
@DockAnnotation
public Object add(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -104,10 +107,12 @@ public class AppSafetyEnvironmentalExplainController extends BaseController {
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("INSPECTED_SITEUSER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
}
safetyenvironmentalexplainService.save(pd);
PageData log = safetyenvironmentalexplainService.save(pd);
pd.put("logData", log);
noticeCorpUtil.SE_PleadingStepUtil(pd);
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}

8
src/main/java/com/zcloud/controller/app/inspection/AppSafetyEnvironmentalInspectorController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.app.inspection;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -63,6 +65,7 @@ public class AppSafetyEnvironmentalInspectorController extends BaseController {
*/
@RequestMapping(value = "/verify")
@ResponseBody
@DockAnnotation
public Object verify(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -91,9 +94,12 @@ public class AppSafetyEnvironmentalInspectorController extends BaseController {
uBean.put("INSPECTION_USER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
}
safetyenvironmentalinspectorService.verify(uBean);
pd.put("uBean", JSON.toJSONString(uBean));
PageData verify = safetyenvironmentalinspectorService.verify(uBean);
pd.put("verify",JSON.toJSONString(verify));
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}

13
src/main/java/com/zcloud/controller/bus/CorpInfoController.java
View File

@ -127,6 +127,19 @@ public class CorpInfoController extends BaseController {
return map;
}
@RequestMapping(value = "/getSelectByCorpInfo")
@ResponseBody
public Object getSelectByCorpInfo() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
List<PageData> varList = corpinfoService.getSelectByCorpInfo(pd);
JSONArray corpInfoJson = JSONArray.fromObject(varList);
map.put("corpInfoJson", corpInfoJson.toString());
map.put("result", errInfo);
return map;
}
/**删除
* @param out
* @throws Exception

12
src/main/java/com/zcloud/controller/bus/HiddenController.java
View File

@ -2151,6 +2151,7 @@ public class HiddenController extends BaseController {
@RequestMapping(value = "/confirmUpdate")
@RequiresPermissions("hidden:edit")
@ResponseBody
@DockAnnotation
public Object confirmUpdate(@RequestParam(value = "FFILE", required = false) MultipartFile file,
@RequestParam(value = "FFILETwo", required = false) MultipartFile fileTwo
@ -2234,7 +2235,8 @@ public class HiddenController extends BaseController {
return map;
}
PageData examine = new PageData();
examine.put("IMGFILES_ID", this.get32UUID());
String IMGFILES_ID = this.get32UUID();
examine.put("IMGFILES_ID", IMGFILES_ID);
examine.put("FOREIGN_KEY", pd.getString("HIDDEN_ID"));
if (pd.getString("STATE").equals("12")) {
examine.put("TYPE", "107");//补充重大隐患信息与临时处置信息
@ -2243,7 +2245,7 @@ public class HiddenController extends BaseController {
}
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("HIDDEN_ID"),examine.getString("TYPE"));
examine.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
imgFilesService.save(examine);//保存上传的PDF
}
@ -2256,7 +2258,8 @@ public class HiddenController extends BaseController {
return map;
}
PageData examine = new PageData();
examine.put("IMGFILES_ID", this.get32UUID());
String IMGFILES_ID = this.get32UUID();
examine.put("IMGFILES_ID", IMGFILES_ID);
examine.put("FOREIGN_KEY", pd.getString("HIDDEN_ID"));
if (pd.getString("STATE").equals("11")) {
examine.put("TYPE", "112");//补充重大隐患信息与临时处置信息
@ -2265,7 +2268,7 @@ public class HiddenController extends BaseController {
}
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + fileTwo.getOriginalFilename().substring(fileTwo.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(fileTwo, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
Smb.sshSftp(fileTwo, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("HIDDEN_ID"),pd.getString("TYPE"));
examine.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
imgFilesService.save(examine);//保存上传的PDF
}
@ -2284,6 +2287,7 @@ public class HiddenController extends BaseController {
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}

6
src/main/java/com/zcloud/controller/bus/ImgFilesController.java
View File

@ -7,6 +7,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -126,12 +127,13 @@ public class ImgFilesController extends BaseController {
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
PageData pd = new PageData();
pd.put("IMGFILES_ID", this.get32UUID());
String IMGFILES_ID = this.get32UUID();
pd.put("IMGFILES_ID", IMGFILES_ID);
pd.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
pd.put("TYPE", TYPE);
pd.put("FOREIGN_KEY", FOREIGN_KEY);
Smb.sshSftp(file, fileName,Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,FOREIGN_KEY,TYPE);
imgfilesService.save(pd);
}
}

15
src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -159,12 +161,15 @@ public class FireCheckListController extends BaseController {
*/
@RequestMapping("/upd4PcById")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object upd4PcById() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = getPageData();
fireCheckListService.upd4PcById(pd);
Map<String, String> fireCheckMap = fireCheckListService.upd4PcById(pd);
pd.put("fireCheckMap",JSON.toJSONString(fireCheckMap));
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@ -178,12 +183,15 @@ public class FireCheckListController extends BaseController {
@LogOperation(value = "新增点检表成功", exceptionInformation = "新增点检表失败")
@RequestMapping(value = "/saveInfo")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object saveInfo() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = getPageData();
fireCheckListService.saveInfo(pd);
ArrayList<PageData> pageData = fireCheckListService.saveInfo(pd);
pd.put("pageDataList", JSON.toJSONString(pageData));
map.put("result", errInfo);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -197,6 +205,7 @@ public class FireCheckListController extends BaseController {
@LogOperation(value = "删除点检表成功", exceptionInformation = "删除点检表失败",isDelete = true)
@RequestMapping("/delByIds")
@ResponseBody
@DockAnnotation
public Object delByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -222,6 +231,7 @@ public class FireCheckListController extends BaseController {
*/
@RequestMapping("/setDelStateByIds")
@ResponseBody
@DockAnnotation
public Object setDelStateByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -298,6 +308,7 @@ public class FireCheckListController extends BaseController {
@LogOperation(value = "禁用点检表成功", exceptionInformation = "禁用点检表失败")
@RequestMapping("/closeCheck")
@ResponseBody
@DockAnnotation
public Object closeCheck() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";

5
src/main/java/com/zcloud/controller/firemanager/FireCheckStandardController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -188,6 +190,7 @@ public class FireCheckStandardController extends BaseController {
@LogOperation(value = "新增消防器材检查标准成功", exceptionInformation = "新增改消防器材检查标准失败")
@RequestMapping(value = "/add")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object saveInfo() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -200,6 +203,7 @@ public class FireCheckStandardController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
fireCheckStandardService.saveInfo(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**
@ -212,6 +216,7 @@ public class FireCheckStandardController extends BaseController {
@LogOperation(value = "删除消防器材检查标准成功", exceptionInformation = "删除改消防器材检查标准失败",isDelete = true)
@RequestMapping("/delByIds")
@ResponseBody
@DockAnnotation
public Object delByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";

6
src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java
View File

@ -3,6 +3,8 @@ package com.zcloud.controller.firemanager;
import java.text.SimpleDateFormat;
import java.util.*;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.entity.system.Dictionaries;
import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.system.DepartmentService;
@ -106,6 +108,7 @@ public class FireDeviceController extends BaseController {
@LogOperation(value = "修改消防设备成功", exceptionInformation = "修改消防设备失败", isUpdate = true, updateId = "FIRE_DEVICE_ID")
@RequestMapping("/updFireDeviceById")
@ResponseBody
@DockAnnotation
public Object updFirePointById() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -127,6 +130,7 @@ public class FireDeviceController extends BaseController {
*/
@RequestMapping("/removeFireDeviceByIds")
@ResponseBody
@DockAnnotation
public Object removeFireDeviceByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -174,6 +178,7 @@ public class FireDeviceController extends BaseController {
@LogOperation(value = "新增消防器材成功", exceptionInformation = "新增消防器材失败")
@RequestMapping(value = "/saveDeviceInfo")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object saveInfo() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -186,6 +191,7 @@ public class FireDeviceController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
fireDeviceService.saveDeviceInfo(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}

9
src/main/java/com/zcloud/controller/firemanager/FirePointController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -148,6 +150,7 @@ public class FirePointController extends BaseController {
@LogOperation(value = "修改消防风险点位成功", exceptionInformation = "修改消防风险点位失败", isUpdate = true, updateId = "FIRE_POINT_ID")
@RequestMapping("/updFireRegionById")
@ResponseBody
@DockAnnotation
public Object updFirePointById(@RequestParam(value = "files",required = false) MultipartFile[] files) {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -185,6 +188,7 @@ public class FirePointController extends BaseController {
@RequestMapping("/removeFirePointByIds")
@ResponseBody
@DockAnnotation
public Object removeFirePointByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -207,17 +211,20 @@ public class FirePointController extends BaseController {
@LogOperation(value = "新增消防风险点位成功", exceptionInformation = "新增消防风险点位失败")
@RequestMapping(value = "/savePointInfo")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object saveInfo(@RequestParam(value = "files",required = false) MultipartFile[] files) {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = getPageData();
String uuid = this.get32UUID();
pd.put("FIRE_POINT_ID", uuid);
initPageDataUtil.initSave(pd);
PageData initData = initPageDataUtil.initSave(pd);
pd.put("initData", JSON.toJSONString(initData));
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
firePointService.savePointInfo(pd);
imgFilesService.uploadPicture(files,"118",pd.getString("FIRE_POINT_ID"));
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}

4
src/main/java/com/zcloud/controller/firemanager/FireRecordController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -223,6 +224,7 @@ public class FireRecordController extends BaseController {
@LogOperation(value = "删除点检记录成功", exceptionInformation = "删除点检记录失败", isDelete = true)
@RequestMapping("/delByIds")
@ResponseBody
@DockAnnotation
public Object delByIds() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -233,6 +235,4 @@ public class FireRecordController extends BaseController {
map.put("result", errInfo);
return map;
}
}

9
src/main/java/com/zcloud/controller/firemanager/FireRegionController.java
View File

@ -1,5 +1,7 @@
package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSON;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.xml.bind.util.JAXBSource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -91,6 +94,7 @@ public class FireRegionController extends BaseController {
@LogOperation(value = "修改消防风险区域成功", exceptionInformation = "修改消防风险区域失败", isUpdate = true, updateId = "FIRE_REGION_ID")
@RequestMapping("/updFireRegionById")
@ResponseBody
@DockAnnotation
public Object updFireRegionById() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -126,12 +130,14 @@ public class FireRegionController extends BaseController {
@LogOperation(value = "删除消防风险区域成功", exceptionInformation = "删除消防风险区域失败", isDelete = true)
@RequestMapping("/delFireRegionByIds")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object delFireRegionByIds() {
Map<String, Object> map = new HashMap<String, Object>();
PageData pd = getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername());
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
fireRegionService.delByIds(map, pd);
map.put("dockData",JSON.toJSONString(pd));
return map;
}
@ -145,6 +151,7 @@ public class FireRegionController extends BaseController {
@RequestMapping(value = "/saveInfo")
@ResponseBody
@LogOperation(value = "保存新的消防风险区域成功", exceptionInformation = "保存新的消防风险区域失败")
@DockAnnotation(isAdd = true)
public Object saveInfo() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -156,6 +163,7 @@ public class FireRegionController extends BaseController {
pd.put("CREATTIME", DateUtil.date2Str(new Date()));
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
fireRegionService.saveInfo(pd);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
@ -170,6 +178,7 @@ public class FireRegionController extends BaseController {
@LogOperation(value = "修改消防风险区域禁用启用状态成功", exceptionInformation = "修改消防风险区域禁用启用状态失败", isUpdate = true, updateId = "FIRE_REGION_ID")
@RequestMapping(value = "/udpStateById")
@ResponseBody
@DockAnnotation
public Object udpStateById() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";

7
src/main/java/com/zcloud/controller/firemanager/FireResourcesController.java
View File

@ -1,5 +1,8 @@
package com.zcloud.controller.firemanager;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
import com.zcloud.aspect.DockAnnotation;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -53,6 +56,7 @@ public class FireResourcesController extends BaseController {
@RequestMapping(value = "/add")
@ResponseBody
@DockAnnotation(isAdd = true)
public Object add(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -64,11 +68,13 @@ public class FireResourcesController extends BaseController {
pd.put("ISDELETE", "0");
fireResourcesService.save(pd,files);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
@RequestMapping(value = "/edit")
@ResponseBody
@DockAnnotation
public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -83,6 +89,7 @@ public class FireResourcesController extends BaseController {
@RequestMapping(value = "/delete")
@ResponseBody
@DockAnnotation
public Object delete(Page page) {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";

7
src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
View File

@ -326,7 +326,12 @@ public class AppFireRecordController extends BaseController {
itemCheckData.putAll(itemCheck);
itemCheckData.put("FOREIGN_KEY", itemCheck.getString("EQUIPMENT_RECORD_ID"));
itemCheckData.put("TYPE", "14");
List<PageData> data = imgFilesService.listAll(itemCheckData);
List<PageData> data = null;
try {
data = imgFilesService.listAll(itemCheckData);
} catch (Exception e) {
throw new RuntimeException(e);
}
// 不合格
if (!"0".equals(itemCheckData.getString("ISNORMAL"))) {
// 删除合格得照片

7
src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java
View File

@ -272,7 +272,7 @@ public class SafetyEnvironmentalController extends BaseController {
@RequestMapping(value = "/add")
@RequiresPermissions("safetyenvironmental:add")
@ResponseBody
@DockAnnotation(isAdd = true)
@DockAnnotation(hasAnnex = true)
public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -287,6 +287,7 @@ public class SafetyEnvironmentalController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("CORPINFO_ID", "1".equals(Jurisdiction.getUSER_ID()) ? "" : Jurisdiction.getCORPINFO_ID()); //企业ID
pd.put("ACTION_USER", Jurisdiction.getName()); //操作人
ArrayList<String> strings = new ArrayList<>();
if (StringUtils.isNotBlank(pd.getString("CONFIRM_MESSAGE_SIGN"))) {
MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("CONFIRM_MESSAGE_SIGN"));
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
@ -300,10 +301,12 @@ public class SafetyEnvironmentalController extends BaseController {
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
strings.add(pd.getString("CONFIRM_MESSAGE_SIGN_ROUTE")+"@@"+fileName);
}
List<PageData> hiddenList = safetyenvironmentalService.save(pd);
pd.put("hiddenList", hiddenList);
map.put("pd", pd);
map.put("sendPicturesList",JSON.toJSONString(strings));
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
@ -359,6 +362,7 @@ public class SafetyEnvironmentalController extends BaseController {
@RequestMapping(value = "/edit")
@RequiresPermissions("safetyenvironmental:edit")
@ResponseBody
@DockAnnotation
public Object edit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
@ -387,6 +391,7 @@ public class SafetyEnvironmentalController extends BaseController {
pd.put("hiddenList", hiddenList);
map.put("pd", pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}

7
src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalExplainController.java
View File

@ -100,7 +100,7 @@ public class SafetyEnvironmentalExplainController extends BaseController {
@RequestMapping(value="/add")
@RequiresPermissions("safetyenvironmentalexplain:add")
@ResponseBody
@DockAnnotation(isAdd = true)
@DockAnnotation(hasAnnex = true)
public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -116,6 +116,7 @@ public class SafetyEnvironmentalExplainController extends BaseController {
pd.put("ACTION_USER", Jurisdiction.getName()); //操作人
pd.put("VALID","1");
pd.put("ISPASS","0");
ArrayList<String> strings = new ArrayList<>();
if (StringUtils.isNotBlank(pd.getString("INSPECTED_SITEUSER_SIGN_IMG"))) {
MultipartFile img = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("INSPECTED_SITEUSER_SIGN_IMG"));
String suffixName = img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -128,8 +129,8 @@ public class SafetyEnvironmentalExplainController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+img.getOriginalFilename().substring(img.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(img, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
pd.put("INSPECTED_SITEUSER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
strings.add(pd.getString("INSPECTED_SITEUSER_SIGN_IMG")+"@@"+fileName);
}
if (null != file && !file.isEmpty()) {
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -145,6 +146,7 @@ public class SafetyEnvironmentalExplainController extends BaseController {
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
pd.put("INSPECTED_EXPLAIN_FILENAME", file.getOriginalFilename());
pd.put("INSPECTED_EXPLAIN_FILEPATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
strings.add(pd.getString("INSPECTED_EXPLAIN_FILEPATH")+"@@"+fileName);
}
PageData logData = safetyenvironmentalexplainService.save(pd);
pd.put("logData",JSON.toJSONString(logData));
@ -152,6 +154,7 @@ public class SafetyEnvironmentalExplainController extends BaseController {
noticeCorpUtil.SE_PleadingStepUtil(pd);
map.put("pd", pd);
map.put("result", errInfo);
map.put("sendPicturesList",JSON.toJSONString(strings));
map.put("dockData", JSON.toJSONString(pd));
return map;
}

7
src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalInspectorController.java
View File

@ -84,7 +84,7 @@ public class SafetyEnvironmentalInspectorController extends BaseController {
@RequestMapping(value="/verify")
@RequiresPermissions("safetyenvironmentalinspector:add")
@ResponseBody
@DockAnnotation(isAdd = true)
@DockAnnotation(hasAnnex = true)
public Object verify() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
@ -97,7 +97,7 @@ public class SafetyEnvironmentalInspectorController extends BaseController {
uBean.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
uBean.put("INSPECTION_STATUS", pd.getString("INSPECTION_STATUS")); //检查进度状态
uBean.put("ACTION_USER", Jurisdiction.getName()); //检查进度状态
ArrayList<String> strings = new ArrayList<>();
if (StringUtils.isNotBlank(pd.getString("INSPECTION_USER_SIGN_IMG"))) {
MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("INSPECTION_USER_SIGN_IMG"));
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
@ -110,14 +110,15 @@ public class SafetyEnvironmentalInspectorController extends BaseController {
String ffile = DateUtil.getDays();
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile);
uBean.put("INSPECTION_USER_SIGN_IMG", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName);
strings.add(uBean.getString("INSPECTION_USER_SIGN_IMG")+"@@"+fileName);
}
pd.put("uBean",JSON.toJSONString(uBean));
PageData verify = safetyenvironmentalinspectorService.verify(uBean);
pd.put("verify",JSON.toJSONString(verify));
map.put("pd", pd);
map.put("result", errInfo);
map.put("sendPicturesList",JSON.toJSONString(strings));
map.put("dockData", JSON.toJSONString(pd));
return map;
}

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

@ -112,7 +112,7 @@ public class OutSourcedController extends BaseController {
String fileName = this.get32UUID() + file1.getOriginalFilename().substring(file1.getOriginalFilename().lastIndexOf("."));
Smb.sshSftp(file1, fileName, Const.FILEPATHFILE + ffile);
pd.put("MEASURES", Const.FILEPATHFILE + ffile + "/" + fileName);
strings.add(Const.FILEPATHFILE + ffile + "/" + fileName);
strings.add(Const.FILEPATHFILE + ffile + "/" + fileName+"@@"+fileName);
}
if (null != file2 && !file2.isEmpty()) {
@ -250,7 +250,7 @@ public class OutSourcedController extends BaseController {
//}
pd.put("INVOLVING_CORPS", Jurisdiction.getCORPINFO_ID());
outsourcedService.save(pd);
pd.put("pictList",strings);
map.put("sendPicturesList",strings);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;

2
src/main/java/com/zcloud/mapper/datasource/bus/CorpInfoMapper.java
View File

@ -76,5 +76,7 @@ public interface CorpInfoMapper{
//从公司端修改企业用户信息 新
void editCorpUserNew(PageData pd);
List<PageData> getSelectByCorpInfo(PageData pd);
}

2
src/main/java/com/zcloud/mapper/datasource/fireresources/FireResourcesMapper.java → src/main/java/com/zcloud/mapper/dsno2/fireresources/FireResourcesMapper.java
View File

@ -1,4 +1,4 @@
package com.zcloud.mapper.datasource.fireresources;
package com.zcloud.mapper.dsno2.fireresources;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;

2
src/main/java/com/zcloud/service/bimap/impl/BiMapServiceImpl.java
View File

@ -5,7 +5,7 @@ import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.bimap.BiMapMapper;
import com.zcloud.mapper.datasource.bus.CorpInfoMapper;
import com.zcloud.mapper.datasource.fireresources.FireResourcesMapper;
import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper;
import com.zcloud.mapper.datasource.keyProjects.PlatformvideomanagementMapper;
import com.zcloud.service.bimap.BiMapService;
import com.zcloud.util.biMapFactory.AbsFireSourcesHandel;

2
src/main/java/com/zcloud/service/bus/CorpInfoService.java
View File

@ -88,5 +88,7 @@ public interface CorpInfoService{
* @throws Exception
*/
void editCorpUserNew(PageData pd)throws Exception;
List<PageData> getSelectByCorpInfo(PageData pd);
}

2
src/main/java/com/zcloud/service/bus/ImgFilesService.java
View File

@ -47,7 +47,7 @@ public interface ImgFilesService{
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd);
public List<PageData> listAll(PageData pd) throws Exception;
/**通过id获取数据
* @param pd

5
src/main/java/com/zcloud/service/bus/impl/CorpInfoServiceImpl.java
View File

@ -121,5 +121,10 @@ public class CorpInfoServiceImpl implements CorpInfoService{
public void editCorpUserNew(PageData pd) throws Exception {
corpinfoMapper.editCorpUserNew(pd);
}
@Override
public List<PageData> getSelectByCorpInfo(PageData pd) {
return corpinfoMapper.getSelectByCorpInfo(pd);
}
}

2
src/main/java/com/zcloud/service/bus/impl/HiddenExamineServiceImpl.java
View File

@ -141,7 +141,9 @@ public class HiddenExamineServiceImpl implements HiddenExamineService {
return hiddenexamineMapper.findByIdAndHidden(pd);
}
public PageData saveApp(PageData pd)throws Exception{
if (pd.get("HIDDENEXAMINE_ID")==null) {
pd.put("HIDDENEXAMINE_ID", UuidUtil.get32UUID());
}
pd.put("CREATTIME", DateUtil.date2Str(new Date()));
pd.put("OPERATTIME",DateUtil.date2Str(new Date()));
hiddenexamineMapper.save(pd);

13
src/main/java/com/zcloud/service/bus/impl/ImgFilesServiceImpl.java
View File

@ -210,16 +210,17 @@ public class ImgFilesServiceImpl implements ImgFilesService{
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = UuidUtil.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
try {
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
} catch (Exception e) {
throw new RuntimeException(e);
}
PageData pd = new PageData();
pd.put("IMGFILES_ID", UuidUtil.get32UUID());
String uuid = UuidUtil.get32UUID();
pd.put("IMGFILES_ID", uuid);
pd.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
pd.put("TYPE", TYPE);
pd.put("FOREIGN_KEY", FOREIGN_KEY);
try {
Smb.sshSftp(file, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile, uuid,FOREIGN_KEY,TYPE);
} catch (Exception e) {
throw new RuntimeException(e);
}
try {
save(pd);
} catch (Exception e) {

7
src/main/java/com/zcloud/service/firemanager/FireCheckListService.java
View File

@ -3,7 +3,9 @@ package com.zcloud.service.firemanager;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 说明：清单列表
@ -39,13 +41,14 @@ public interface FireCheckListService {
void updById(PageData pd) throws Exception;
/**
* @return
* @Description: 保存
* @Author: dearLin
* @Date: 2023/3/8/008 17:12
* @Param: [com.zcloud.entity.PageData] [pd]
* @Return: void
*/
void saveInfo(PageData pd) throws Exception;
ArrayList<PageData> saveInfo(PageData pd) throws Exception;
/**
* @Description: 删除
@ -112,7 +115,7 @@ public interface FireCheckListService {
List<PageData> getFireCheckListCountByAppV2(PageData pageData);
void upd4PcById(PageData pd);
Map<String, String> upd4PcById(PageData pd);
void setDelStateByIds(PageData pd);
}

21
src/main/java/com/zcloud/service/firemanager/impl/FireCheckListServiceImpl.java
View File

@ -82,6 +82,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
}
/**
* @return
* @Description: 保存
* @Author: dearLin
* @Date: 2023/3/8/008 17:15
@ -90,8 +91,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void saveInfo(PageData pd) throws Exception {
public ArrayList<PageData> saveInfo(PageData pd) throws Exception {
// 处理一下检查表器材的检查项
PageData pageData = JSON.parseObject((String) pd.get("from"), PageData.class);
JSONArray userId = (JSONArray) pageData.get("USER_ID");
@ -99,12 +99,15 @@ public class FireCheckListServiceImpl implements FireCheckListService {
StringBuilder stringBuilder = new StringBuilder();
String dataJson = JSON.toJSONString(dataList);
LinkedList<PageData> logPageLinkedList = new LinkedList<>();
ArrayList<PageData> fireCheckList = new ArrayList<>();
String OPERATOR = Jurisdiction.getUSER_ID();
String OPERATOR_CORPINFO_ID = Jurisdiction.getCORPINFO_ID();
String OPERATOR_NAME = Jurisdiction.getName();
// 给每个人初始化点检表
userId.forEach(USERID -> {
PageData saveData = new PageData();
PageData logPageData = new PageData();
PageData fireCheck = new PageData();
List<PageData> preDataList = new ArrayList<>();
String fire_check_id = UuidUtil.get32UUID();
pd.put("FIRE_CHECK_TYPE", pageData.get("FIRE_CHECK_TYPE"));
@ -120,6 +123,8 @@ public class FireCheckListServiceImpl implements FireCheckListService {
pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
//检查表
fireCheckListMapper.saveInfo(pd);
fireCheck.putAll(pd);
saveData.put("fireCheck",JSON.toJSONString(fireCheck));
try {
FHLOG.save(Jurisdiction.getUsername(), "保存点检表信息FIRE_CHECK_ID为" + fire_check_id);
} catch (Exception e) {
@ -147,6 +152,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
data.put("OPERATTIME", DateUtil.date2Str(new Date()));
preDataList.add(data);
}
saveData.put("preDataList",JSON.toJSONString(preDataList));
// 清单的器材
firePreparedCheckListService.saveInfo(preDataList);
List<PageData> prePointHiddenDataList = new ArrayList<>();
@ -159,6 +165,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
pdPOINT.put("CORPINFO_ID", OPERATOR_CORPINFO_ID);
prePointHiddenDataList.add(pdPOINT);
});
saveData.put("prePointHiddenDataList",JSON.toJSONString(prePointHiddenDataList));
// 消防点位表用于点检的
firePointPreparedService.saveBatch(prePointHiddenDataList);
logPageData.put("CARRYINGDATA", dataJson);
@ -171,9 +178,12 @@ public class FireCheckListServiceImpl implements FireCheckListService {
.append("。的消防点检表。");
pageData.put("SKETCH", stringBuilder.toString());
stringBuilder.setLength(0);
saveData.put("logPageData",JSON.toJSONString(logPageData));
logPageLinkedList.add(logPageData);
fireCheckList.add(saveData);
});
fireChangeLogMapper.saveBatch(logPageLinkedList);
return fireCheckList;
}
/**
@ -458,7 +468,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
@Override
@Transactional(rollbackFor = Exception.class)
public void upd4PcById(PageData pd) {
public Map<String, String> upd4PcById(PageData pd) {
// 修改 针对于点检表只会修改 "FIRE_CHECK_STANDARD_NAME":"0914表-012","FIRE_CHECK_TYPE":"checkPeriod0001"
// bus_fire_point_prepared 中点位 需要传过来的表单去计算要删除哪个，要新增哪个
// bus_fire_device_prepared 的器材会传过来
@ -492,6 +502,8 @@ public class FireCheckListServiceImpl implements FireCheckListService {
});
LinkedList<PageData> DEVICE_PREPARED_DATA = new LinkedList<>();
List<JSONObject> dataList = (List<JSONObject>) postData.get("DATA");
Map<String,String> deviceInfoMap = new HashMap<>();
int count = 1;
for (JSONObject item : dataList) {
FIRE_PREPARED_DEVICE_TABLE.put(item.getString("FIRE_POINT_ID"), 1);
if (Tools.isEmpty(item.getString("FIRE_PREPARED_ID"))) {
@ -505,6 +517,8 @@ public class FireCheckListServiceImpl implements FireCheckListService {
device_prepared_info.put("OPERATOR", OPERATOR);
device_prepared_info.put("CREATTIME", DateUtil.date2Str(new Date()));
device_prepared_info.put("OPERATTIME", DateUtil.date2Str(new Date()));
deviceInfoMap.put("deviceInfo"+count,JSON.toJSONString(device_prepared_info));
count++;
DEVICE_PREPARED_DATA.add(device_prepared_info);
}
}
@ -610,6 +624,7 @@ public class FireCheckListServiceImpl implements FireCheckListService {
fireRecordService.updCheckedByRidPid(checkedPageData);
}
}
return deviceInfoMap;
}
@Override

2
src/main/java/com/zcloud/service/fireresources/impl/FireResourcesServiceImpl.java
View File

@ -2,7 +2,7 @@ package com.zcloud.service.fireresources.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.fireresources.FireResourcesMapper;
import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper;
import com.zcloud.service.bus.ImgFilesService;
import com.zcloud.service.fireresources.FireResourcesService;
import com.zcloud.util.Tools;

3
src/main/java/com/zcloud/service/hiddenApi/HiddenExamineApiService.java
View File

@ -139,10 +139,11 @@ public interface HiddenExamineApiService {
public int adoptExamine(String hiddenexamineId ,String examine)throws Exception;
/**
* 隐患打回
*
* @param hiddenId
* @param EXAMINE
* @throws Exception
*/
public int saveRepulseCheckApp(String hiddenId ,String EXAMINE,String loginUserId)throws Exception;
public PageData saveRepulseCheckApp(String hiddenId , String EXAMINE, String loginUserId)throws Exception;
}

6
src/main/java/com/zcloud/service/hiddenApi/impl/HiddenExamineApiServiceImpl.java
View File

@ -242,7 +242,7 @@ public class HiddenExamineApiServiceImpl implements HiddenExamineApiService {
exam.put("EXAMINE",examine);
return hiddenExamineApiMapper.adoptExamine(exam);
}
public int saveRepulseCheckApp(String hiddenId ,String EXAMINE,String loginUserId)throws Exception{
public PageData saveRepulseCheckApp(String hiddenId , String EXAMINE, String loginUserId)throws Exception{
PageData exam = new PageData();// 添加隐患初始信息
exam.put("HIDDENEXAMINE_ID",UuidUtil.get32UUID());
exam.put("CREATOR",loginUserId);
@ -253,7 +253,9 @@ public class HiddenExamineApiServiceImpl implements HiddenExamineApiService {
exam.put("STATE",-1);//验收打回变成初始状态-1
exam.put("EXAMINE",EXAMINE);//打回意见
exam.put("HIDDEN_ID",hiddenId);//隐患ID
return hiddenExamineApiMapper.save(exam);
int save = hiddenExamineApiMapper.save(exam);
exam.put("result",save);
return exam;
}
}

13
src/main/java/com/zcloud/service/inspection/impl/SafetyEnvironmentalServiceImpl.java
View File

@ -290,6 +290,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
}
}
}
pd.put("inspector",JSON.toJSONString(inspector));
safetyenvironmentalinspectorService.save(inspector);
if (note_flag) noticeCorpUtil.SE_OneStepUtil(inspector);
time = DateUtil.calculateDateSecond(time, 1);
@ -331,6 +332,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
if (Tools.notEmpty(pd.getString("SITUATIONJSON"))) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("SITUATIONJSON"));
String time = currentTime;
ArrayList<PageData> situationList = new ArrayList<>();
for (JSONObject json : list) {
PageData situationPd = new PageData();
if (Tools.isEmpty(json.getString("INSPECTION_SITUATION_ID"))) {
@ -343,6 +345,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
situationPd.put("OPERATOR", pd.getString("OPERATOR")); //修改人
situationPd.put("OPERATTIME", time); //修改时间
situationPd.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); //企业ID
situationList.add(situationPd);
safetyenvironmentalsituationService.save(situationPd);
time = DateUtil.calculateDateSecond(time, 1);
} else {
@ -351,9 +354,11 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
situationPd.put("SITUATION", json.getString("SITUATION")); //检查情况
situationPd.put("OPERATOR", pd.getString("OPERATOR")); //修改人
situationPd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
situationList.add(situationPd);
safetyenvironmentalsituationService.edit(situationPd);
}
}
pd.put("situationList",JSON.toJSONString(situationList));
}
String[] delHiddens = "".equals(pd.getString("delHiddens")) ? new String[0] : pd.getString("delHiddens").split(",");
if (delHiddens.length > 0) {
@ -367,6 +372,8 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
if (Tools.notEmpty(pd.getString("HIDDENJSON"))) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("HIDDENJSON"));
String time = currentTime;
ArrayList<PageData> hiddenpdList = new ArrayList<>();
ArrayList<PageData> userList = new ArrayList<>();
for (JSONObject json : list) {
PageData hidden = new PageData();
if (Tools.isEmpty(json.getString("HIDDEN_ID"))) {
@ -389,6 +396,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
hidden.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
hidden.put("POSITIONDESC",json.getString("POSITIONDESC"));
hidden.put("ISRELEVANT",json.getString("ISRELEVANT"));
hiddenpdList.add(hidden);
hiddenService.save(hidden);
time = DateUtil.calculateDateSecond(time, 1);
} else {
@ -409,6 +417,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
hidden.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
hidden.put("POSITIONDESC",json.getString("POSITIONDESC"));
hidden.put("ISRELEVANT",json.getString("ISRELEVANT"));
hiddenpdList.add(hidden);
hiddenService.editInfo(hidden);
PageData del = new PageData();
@ -423,9 +432,12 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
findUser.put("USER_ID",json.getString("CREATOR"));
findUser.put("TYPE","1");
findUser.put("IS_MAIN","0");
userList.add(findUser);
hiddenUserService.save(findUser);
hiddenList.add(hidden);
}
pd.put("hiddenpdList",JSON.toJSONString(hiddenpdList));
pd.put("userList",JSON.toJSONString(userList));
}
String[] delHiddenFiles = "".equals(pd.getString("delHiddenFiles")) ? new String[0] : pd.getString("delHiddenFiles").split(",");
@ -442,6 +454,7 @@ public class SafetyEnvironmentalServiceImpl implements SafetyEnvironmentalServic
log.put("ACTION", "安全环保检查重新申请"); //操作内容
log.put("CREATTIME", pd.getString("CREATTIME")); //添加时间
log.put("CREATOR", pd.getString("ACTION_USER")); //添加人姓名
pd.put("log",JSON.toJSONString(log));
safetyenvironmentallogService.save(log);
// 编辑的时候自动清空附件
if (!"1".equals(pd.getString("unClear"))){

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

@ -20,12 +20,13 @@ public class InitPageDataUtil {
* @param pd
* @return
*/
public void initSave(PageData pd) {
public PageData initSave(PageData pd) {
pd.put("CREATOR", Jurisdiction.getUSER_ID()); //添加人
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATOR", Jurisdiction.getUSER_ID()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除(0:有效 1：删除)
return pd;
}
public void initSave(PageData pd, String PRIMARY_KEY) {

2
src/main/java/com/zcloud/util/biMapFactory/AbsFireSourcesHandel.java
View File

@ -1,7 +1,7 @@
package com.zcloud.util.biMapFactory;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.fireresources.FireResourcesMapper;
import com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper;
import com.zcloud.service.fireresources.FireResourcesService;
import org.springframework.beans.factory.InitializingBean;

26
src/main/resources/mybatis/datasource/bus/CorpInfoMapper.xml
View File

@ -453,4 +453,30 @@
where USER_ID = #{USER_ID}
</update>
<select id="getSelectByCorpInfo" resultType="com.zcloud.entity.PageData">
select
<include refid="Field"></include>
from
<include refid="tableName"></include>
f
left join `qa-czks-prevention`.sys_dictionaries d on d.DICTIONARIES_ID = f.REPORT_CYCLE
left join `qa-czks-regulatory`.BUS_CORPTYPE type on type.CORPTYPE_ID = f.CORP_OF_TYPE
left join `qa-czks-regulatory`.BUS_CORPTYPE type2 on type2.CORPTYPE_ID = f.CORP_OF_TYPE2
LEFT JOIN `qa-czks-prevention`.sys_dictionaries prvince ON prvince.BIANMA = f.PROVINCE
left join `qa-czks-prevention`.sys_dictionaries city on city.BIANMA = f.CITY
left join `qa-czks-prevention`.sys_dictionaries country on country.BIANMA = f.COUNTRY
left join `qa-czks-prevention`.sys_dictionaries village on village.BIANMA = f.VILLAGE
left join `qa-czks-prevention`.sys_dictionaries corpState on corpState.BIANMA = f.CORP_STATE
left join `qa-czks-prevention`.sys_dictionaries sub on sub.BIANMA = f.SUBORDINATION
left join `qa-czks-prevention`.sys_dictionaries ct1 on ct1.DICTIONARIES_ID = f.CORP_TYPE
left join `qa-czks-prevention`.sys_dictionaries ct2 on ct2.DICTIONARIES_ID = f.CORP_TYPE2
left join `qa-czks-prevention`.sys_dictionaries ct3 on ct3.DICTIONARIES_ID = f.CORP_TYPE3
left join `qa-czks-prevention`.sys_dictionaries ct4 on ct4.DICTIONARIES_ID = f.CORP_TYPE4
LEFT JOIN `qa-czks-prevention`.sys_dictionaries sd ON sd.DICTIONARIES_ID = f.INDUSTRY
left join `qa-czks-prevention`.sys_dictionaries state on state.BIANMA = f.CORP_STATE
LEFT JOIN `qa-czks-prevention`.sys_user su on su.CORPINFO_ID = f.CORPINFO_ID and su.isdelete = '0'
where 1=1 and f.ISDELETE ='0' and su.ISDELETE ='0'
GROUP BY f.CORPINFO_ID
ORDER BY (f.COR_ORDER+0) asc
</select>
</mapper>

10
src/main/resources/mybatis/datasource/bus/HiddenMapper.xml
View File

@ -875,11 +875,11 @@
(select group_concat(chr.NAME) from BUS_HIDDENCHECK bh left join sys_user chr on chr.USER_ID=bh.USER_ID where bh.HIDDEN_ID=f.HIDDEN_ID ) CHECKNAME
from
<include refid="tableName"></include> f
left join qa-gwj-prevention.`vi_user_all` cr on cr.USER_ID = f.CREATOR
left join qa-gwj-prevention.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR
left join qa-gwj-prevention.`vi_user_all` ch on ch.USER_ID = f.CHECKOR
left join qa-gwj-prevention.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR
left join qa-gwj-prevention.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER
left join `qa-czks-prevention`.`vi_user_all` cr on cr.USER_ID = f.CREATOR
left join `qa-czks-prevention`.`vi_user_all` re on re.USER_ID = f.RECTIFICATIONOR
left join `qa-czks-prevention`.`vi_user_all` ch on ch.USER_ID = f.CHECKOR
left join `qa-czks-prevention`.`vi_user_all` rev on rev.USER_ID = f.REVIEWOR
left join `qa-czks-prevention`.`vi_user_all` conUser on conUser.USER_ID = f.CONFIRM_USER
left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
left join oa_department red on red.DEPARTMENT_ID = f.RECTIFICATIONDEPT
left join oa_department chd on chd.DEPARTMENT_ID = f.CHECKDEPT

472
src/main/resources/mybatis/dsno2/fireresources/FireResourcesMapper.xml Normal file
View File

@ -0,0 +1,472 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.dsno2.fireresources.FireResourcesMapper">
<!--表名 -->
<sql id="tableName">
bus_fireresources
</sql>
<!-- 字段 -->
<sql id="Field">
FIRERESOURCES_ID,
FIRERESOURCES_NAME,
FIRERESOURCES_TYPE,
LONGTITUDE,
LATITUDE,
DESCR,
CREATIME,
OPERATIME,
ISDELETE,
CORPINFO_ID,
STATE
</sql>
<!-- 字段值 -->
<sql id="FieldValue">
#{FIRERESOURCES_ID},
#{FIRERESOURCES_NAME},
#{FIRERESOURCES_TYPE},
#{LONGTITUDE},
#{LATITUDE},
#{DESCR},
#{CREATIME},
#{OPERATIME},
#{ISDELETE},
#{CORPINFO_ID},
#{STATE}
</sql>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set ISDELETE = '1'
where
FIRERESOURCES_ID = #{FIRERESOURCES_ID}
</delete>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
FIRERESOURCES_NAME = #{FIRERESOURCES_NAME},
FIRERESOURCES_TYPE = #{FIRERESOURCES_TYPE},
LONGTITUDE = #{LONGTITUDE},
LATITUDE = #{LATITUDE},
DESCR = #{DESCR},
OPERATIME = #{OPERATIME},
ISDELETE = #{ISDELETE},
CORPINFO_ID = #{CORPINFO_ID},
STATE = #{STATE}
where
FIRERESOURCES_ID = #{FIRERESOURCES_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
select
f.*
from
<include refid="tableName"></include> f
where
FIRERESOURCES_ID = #{FIRERESOURCES_ID}
</select>
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.*,
c.CORP_NAME,
sd1.NAME as FIRERESOURCES_TYPENAME
from
<include refid="tableName"></include> f
left join `qa-czks-prevention`.sys_dictionaries sd1 on sd1.BIANMA = f.FIRERESOURCES_TYPE
left join `qa-czks-prevention`.bus_corp_info c on c.CORPINFO_ID = f.CORPINFO_ID
where
f.ISDELETE = '0'
<if test="pd.FIRERESOURCES_NAME != null and pd.FIRERESOURCES_NAME != ''">
and ( f.FIRERESOURCES_NAME LIKE CONCAT(CONCAT('%', #{pd.FIRERESOURCES_NAME}),'%') )
</if>
<if test="pd.FIRERESOURCES_TYPE != null and pd.FIRERESOURCES_TYPE != ''">
and f.FIRERESOURCES_TYPE = #{pd.FIRERESOURCES_TYPE}
</if>
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and f.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
order by f.CREATIME desc
</select>
<!-- 列表(全部) -->
<select id="listAll" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include>
</select>
<select id="getControlRoomDataList" resultType="com.zcloud.entity.PageData">
SELECT
FIRERESOURCES_ID id,
FIRERESOURCES_NAME NAME,
d.BIANMA TYPE,
LONGTITUDE LONGITUDE,
LATITUDE,
DESCR,
'./bi/images/map/xiaofang/contro.png' IMAGE_FILE
FROM
bus_fireresources f
LEFT JOIN `qa-czks-prevention`.sys_dictionaries d ON f.FIRERESOURCES_TYPE = d.BIANMA
WHERE
f.ISDELETE = 0
AND f.FIRERESOURCES_TYPE = 'xfkzs01'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="list != null and list.size() > 0">
AND f.CORPINFO_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getPumpRoomDataList" resultType="com.zcloud.entity.PageData">
SELECT
FIRERESOURCES_ID id,
FIRERESOURCES_NAME NAME,
d.BIANMA TYPE,
LONGTITUDE LONGITUDE,
LATITUDE,
DESCR,
'./bi/images/map/xiaofang/pumpRoom.png' IMAGE_FILE
FROM
bus_fireresources f
LEFT JOIN `qa-czks-prevention`.sys_dictionaries d ON f.FIRERESOURCES_TYPE = d.BIANMA
WHERE
f.ISDELETE = 0
AND f.FIRERESOURCES_TYPE = 'xfbf01'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="list != null and list.size() > 0">
AND f.CORPINFO_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getRescueTeamDataList" resultType="com.zcloud.entity.PageData">
SELECT
FIRERESOURCES_ID id,
FIRERESOURCES_NAME NAME,
d.BIANMA TYPE,
LONGTITUDE LONGITUDE,
LATITUDE,
DESCR,
'./bi/images/map/xiaofang/rescueTeam.png' IMAGE_FILE
FROM
bus_fireresources f
LEFT JOIN `qa-czks-prevention`.sys_dictionaries d ON f.FIRERESOURCES_TYPE = d.BIANMA
WHERE
f.ISDELETE = 0
AND f.FIRERESOURCES_TYPE = 'xfjyd01'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="list != null and list.size() > 0">
AND f.CORPINFO_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getWaterSourceDataList" resultType="com.zcloud.entity.PageData">
SELECT
FIRERESOURCES_ID id,
FIRERESOURCES_NAME NAME,
d.BIANMA TYPE,
LONGTITUDE LONGITUDE,
LATITUDE,
DESCR,
'./bi/images/map/xiaofang/waterSource.png' IMAGE_FILE
FROM
bus_fireresources f
LEFT JOIN `qa-czks-prevention`.sys_dictionaries d ON f.FIRERESOURCES_TYPE = d.BIANMA
WHERE
f.ISDELETE = 0
AND f.FIRERESOURCES_TYPE = 'xfsy01'
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="list != null and list.size() > 0">
AND f.CORPINFO_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getPointDataList" resultType="com.zcloud.entity.PageData">
SELECT
FIRE_POINT_ID id,
FIRE_POINT_NAME NAME,
'point' TYPE,
LONGITUDE,
LATITUDE
FROM
`qa-czks-prevention`.bus_fire_point f
WHERE
f.ISDELETE = 0
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="list != null and list.size() > 0">
AND f.CORPINFO_ID in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="getDataById" resultType="com.zcloud.entity.PageData">
SELECT
f.*,
c.CORP_NAME
FROM
bus_fireresources f
left join `qa-czks-prevention`.bus_corp_info c on f.CORPINFO_ID = c.CORPINFO_ID
where f.ISDELETE = 0
and f.FIRERESOURCES_ID = #{FIRERESOURCES_ID}
</select>
<select id="getCheckRecordByPid" resultType="pd">
SELECT
frp.EQUIPMENT_POINT_ID,
fc.FIRE_CHECK_STANDARD_NAME,
fc.FIRE_CHECK_TYPE,
u.`NAME` USERNAME,
dep.`NAME` deptName,
d.`NAME` dicName,
fpp.FIRE_CHECK_ID,
fr.FIRE_RECORD_ID,
fp.FIRE_POINT_NAME,
reg.FIRE_REGION_NAME,
fpp.FIRE_POINT_ID,
fr.CHECK_TIME,
fr.PERIODSTART,
fr.PERIODEND
FROM
`qa-czks-prevention`.bus_fire_record fr
LEFT JOIN `qa-czks-prevention`.bus_fire_point_prepared fpp ON fr.FIRE_CHECK_ID = fpp.FIRE_CHECK_ID
LEFT JOIN `qa-czks-prevention`.bus_fire_checklist fc ON fpp.FIRE_CHECK_ID = fc.FIRE_CHECK_ID
LEFT JOIN `qa-czks-prevention`.sys_dictionaries d ON fc.FIRE_CHECK_TYPE = d.BIANMA
LEFT JOIN `qa-czks-prevention`.sys_user u ON fc.USER_ID = u.USER_ID
LEFT JOIN `qa-czks-prevention`.bus_fire_point fp ON fp.FIRE_POINT_ID = fpp.FIRE_POINT_ID
LEFT JOIN `qa-czks-prevention`.bus_fire_region reg ON reg.FIRE_REGION_ID = fp.FIRE_REGION_ID
LEFT JOIN `qa-czks-prevention`.oa_department dep ON dep.DEPARTMENT_ID = fc.DEPARTMENT_ID
LEFT JOIN `qa-czks-prevention`.bus_fire_record_point frp ON fr.FIRE_RECORD_ID = frp.FIRE_RECORD_ID AND fp.FIRE_POINT_ID = frp.FIRE_POINT_ID
WHERE
fr.FINISHED = 1
and fc.ISDELETE = 0
and frp.ISDELETE = 0
<if test="FIRE_POINT_ID != null and FIRE_POINT_ID != ''" >
AND fpp.FIRE_POINT_ID = #{FIRE_POINT_ID}
</if>
<if test="KEYWORDS != null and KEYWORDS != ''" >
AND fc.FIRE_CHECK_STANDARD_NAME like concat('%',concat(#{KEYWORDS},'%'))
</if>
GROUP BY
fr.FIRE_CHECK_ID,
fr.FIRE_RECORD_ID
ORDER BY
fr.OPERATTIME DESC
</select>
<select id="findPointById" resultType="com.zcloud.entity.PageData">
SELECT
p.FIRE_POINT_ID,
p.FIRE_POINT_NAME,
p.FIRE_POINT_CODE,
p.QUALIFIED_PHOTOS_ID,
p.LONGITUDE,
p.LATITUDE,
CONCAT_WS('--', p.LATITUDE,p.LONGITUDE) LONGTITUDEANDLATITUDE,
r.FIRE_REGION_ID,
d.`NAME` AS DEPARTMENT_NAME,
u.`NAME` AS USERNAME,
r.FIRE_REGION_NAME,
u.USER_ID,
p.DEPARTMENT_ID
FROM
`qa-czks-prevention`.bus_fire_point AS p
left JOIN `qa-czks-prevention`.bus_fire_region AS r ON p.FIRE_REGION_ID = r.FIRE_REGION_ID
LEFT JOIN `qa-czks-prevention`.sys_user AS u ON p.USER_ID = u.USER_ID
left JOIN `qa-czks-prevention`.oa_department AS d ON p.DEPARTMENT_ID = d.DEPARTMENT_ID
WHERE
r.ISDELETE = 0 AND p.ISDELETE = 0
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
AND r.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="FIRE_POINT_ID != null and FIRE_POINT_ID != ''">
AND FIRE_POINT_ID = #{FIRE_POINT_ID}
</if>
</select>
<select id="listAll4H5" resultType="com.zcloud.entity.PageData">
SELECT fp.USER_ID,
fp.DEPARTMENT_ID,
fp.FIRE_POINT_NAME,
fp.FIRE_POINT_CODE,
fp.FIRE_POINT_ID,
fr.FIRE_REGION_NAME,
fr.FIRE_REGION_ID,
fd.FIRE_DEVICE_CODE,
fd.FIRE_DEVICE_TYPE_ID,
fd.VALIDITY_START_TIME,
fd.VALIDITY_END_TIME,
fd.REMAKE,
fd.FIRE_DEVICE_ID,
su.`NAME` AS USERNAME,
d.`NAME` AS DEPARTMENTNAME,
`qa-czks-prevention`.sys_dictionaries.`NAME` AS FIRE_DEVICE_TYPE_NAME,
GROUP_CONCAT(DISTINCT FIRE_CHECK_STANDARD_ITEM ORDER BY FIRE_CHECK_STANDARD_ITEM SEPARATOR '@@' ) FIRE_CHECK_STANDARD_ITEM
FROM `qa-czks-prevention`.bus_fire_point AS fp
LEFT JOIN `qa-czks-prevention`.bus_fire_device AS fd ON fp.FIRE_POINT_ID = fd.FIRE_POINT_ID
LEFT JOIN `qa-czks-prevention`.bus_fire_region AS fr ON fd.FIRE_REGION_ID = fr.FIRE_REGION_ID
LEFT JOIN `qa-czks-prevention`.sys_user AS su ON fp.USER_ID = su.USER_ID
LEFT JOIN `qa-czks-prevention`.oa_department AS d ON fd.DEPARTMENT_ID = d.DEPARTMENT_ID
LEFT JOIN `qa-czks-prevention`.sys_dictionaries ON fd.FIRE_DEVICE_TYPE_ID = sys_dictionaries.BIANMA
LEFT JOIN `qa-czks-prevention`.bus_fire_check_standard fcs on fd.FIRE_DEVICE_TYPE_ID = fcs.FIRE_DEVICE_TYPE
WHERE fp.ISDELETE = 0
AND fd.ISDELETE = 0
and fcs.ISDELETE = 0
AND fp.FIRE_POINT_ID = #{FIRE_POINT_ID}
GROUP BY fd.FIRE_DEVICE_CODE
ORDER BY fr.FIRE_REGION_ID,
fr.CREATTIME,
fp.FIRE_POINT_ID,
fp.CREATTIME,
fd.FIRE_DEVICE_TYPE_ID,
fd.CREATTIME,
fd.OPERATTIME DESC
</select>
<select id="getPointQualifiedPhotosByEpid" resultType="com.zcloud.entity.PageData">
SELECT
img.*
FROM
`qa-czks-prevention`.bus_imgfiles img
LEFT JOIN `qa-czks-prevention`.`qa-czks-prevention`.bus_fire_record_point p ON p.QUALIFIED_PHOTOS_ID = img.FOREIGN_KEY
WHERE
img.TYPE = 115
and p.EQUIPMENT_POINT_ID = #{EQUIPMENT_POINT_ID}
</select>
<select id="getPointQualifiedPhotos" resultType="com.zcloud.entity.PageData">
SELECT
img.*
FROM
`qa-czks-prevention`.bus_imgfiles img
LEFT JOIN `qa-czks-prevention`.bus_fire_point p ON p.QUALIFIED_PHOTOS_ID = img.FOREIGN_KEY
WHERE
img.TYPE = 115
and p.FIRE_POINT_ID = #{FIRE_POINT_ID}
</select>
<select id="goRecordDeviceByPid" resultType="com.zcloud.entity.PageData">
SELECT
frd.EQUIPMENT_RECORD_ID,
frd.ISNORMAL,
IFNULL( frd.HIDDEN_ID, '' ) HIDDEN_ID,
frd.FIRE_RECORD_ID,
fp.FIRE_POINT_ID,
fp.FIRE_POINT_NAME,
fr.FIRE_REGION_ID,
fr.FIRE_REGION_NAME,
frp.P_ISCHECKED ISCHECKED,
GROUP_CONCAT( DISTINCT d.NAME ) dicName,
GROUP_CONCAT( DISTINCT fd.FIRE_DEVICE_CODE ) FIRE_DEVICE_CODE,
GROUP_CONCAT( DISTINCT fd.FIRE_DEVICE_TYPE_ID ) FIRE_DEVICE_TYPE_ID,
GROUP_CONCAT( DISTINCT fcs.FIRE_CHECK_STANDARD_ITEM ORDER BY FIRE_CHECK_STANDARD_ITEM desc SEPARATOR '@@' ) FIRE_CHECK_STANDARD_ITEM
FROM
bus_fire_record_device frd
LEFT JOIN bus_fire_device fd ON frd.FIRE_DEVICE_ID = fd.FIRE_DEVICE_ID
LEFT JOIN sys_dictionaries d ON fd.FIRE_DEVICE_TYPE_ID = d.BIANMA
LEFT JOIN bus_fire_point fp ON fd.FIRE_POINT_ID = fp.FIRE_POINT_ID
LEFT JOIN bus_fire_record_point frp ON frp.FIRE_POINT_ID = fp.FIRE_POINT_ID
AND frd.FIRE_RECORD_ID = frp.FIRE_RECORD_ID
LEFT JOIN bus_fire_region fr ON fp.FIRE_REGION_ID = fr.FIRE_REGION_ID
LEFT JOIN bus_fire_check_standard fcs ON fd.FIRE_DEVICE_TYPE_ID = fcs.FIRE_DEVICE_TYPE
AND fcs.ISDELETE = 0
where frd.FIRE_RECORD_ID = #{FIRE_RECORD_ID} and fp.FIRE_POINT_ID = #{FIRE_POINT_ID}
GROUP BY
frd.FIRE_RECORD_ID,
fd.FIRE_DEVICE_ID
ORDER BY fd.FIRE_DEVICE_CODE
</select>
<select id="devicelistPage" resultType="com.zcloud.entity.PageData">
SELECT
d.FIRE_POINT_ID,
p.FIRE_POINT_NAME,
FIRE_DEVICE_TYPE_ID,
dic.`NAME` FIRE_DEVICE_TYPE_NAME,
COUNT( 1 ) COUNT
FROM
`qa-czks-prevention`.bus_fire_device d
LEFT JOIN `qa-czks-prevention`.bus_fire_point p ON d.FIRE_POINT_ID = p.FIRE_POINT_ID
LEFT JOIN `qa-czks-prevention`.sys_dictionaries dic ON d.FIRE_DEVICE_TYPE_ID = dic.BIANMA
WHERE
d.ISDELETE = 0 and p.isdelete = 0
<if test="pd.FIRE_DEVICE_TYPE_ID != null and pd.FIRE_DEVICE_TYPE_ID != ''">
and d.FIRE_DEVICE_TYPE_ID = #{pd.FIRE_DEVICE_TYPE_ID}
</if>
<if test="pd.FIRE_POINT_NAME != null and pd.FIRE_POINT_NAME != ''">
and p.FIRE_POINT_NAME like concat('%',concat(#{pd.FIRE_POINT_NAME},'%'))
</if>
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and d.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.AREA != null and pd.AREA != ''">
and d.CORPINFO_ID IN (select CORPINFO_ID from `qa-czks-prevention`.bus_corp_info where AREA = #{pd.AREA} and ISDELETE = 0)
</if>
GROUP BY
d.FIRE_POINT_ID,
d.FIRE_DEVICE_TYPE_ID
ORDER BY
d.CREATTIME DESC
</select>
<select id="getPointCheckPhotoById" resultType="com.zcloud.entity.PageData">
SELECT
GROUP_CONCAT( img.FILEPATH SEPARATOR '@@' ) FILEPATHLIST,
u.`NAME` CREATOR_NAME,
cl.FIRE_CHECK_ID,
cl.FIRE_CHECK_STANDARD_NAME,
frp.EQUIPMENT_POINT_ID,
frp.FIRE_POINT_ID,
frp.FIRE_RECORD_ID,
frp.CREATTIME
FROM
`qa-czks-prevention`.bus_fire_checklist cl
LEFT JOIN `qa-czks-prevention`.bus_fire_record_point frp ON frp.fire_check_id = cl.fire_check_id
AND cl.ISDELETE = 0
LEFT JOIN `qa-czks-prevention`.bus_imgfiles img ON frp.EQUIPMENT_POINT_ID = img.FOREIGN_KEY
LEFT JOIN `qa-czks-prevention`.sys_user u on frp.CREATOR = u.USER_ID
WHERE
frp.ISDELETE = 0
AND frp.FIRE_POINT_ID = #{FIRE_POINT_ID}
AND frp.P_ISCHECKED = 0
GROUP BY
cl.FIRE_CHECK_ID
ORDER BY
frp.CREATTIME DESC
limit 1
</select>
</mapper>