diff --git a/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java b/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java index f46e4dab..d1f125a8 100644 --- a/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java +++ b/src/main/java/com/zcloud/controller/accident/AccidentRecordsController.java @@ -1,12 +1,11 @@ package com.zcloud.controller.accident; -import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.entity.accident.AccidentRecords; import com.zcloud.service.accident.AccidentRecordsService; import com.zcloud.util.ObjectExcelView; import lombok.RequiredArgsConstructor; @@ -71,8 +70,11 @@ public class AccidentRecordsController extends BaseController { @ResponseBody @RequestMapping("/save") public Map save(HttpServletRequest request) { - AccidentRecords accidentRecords = BeanUtil.mapToBean(new PageData(request), AccidentRecords.class, true); - accidentRecordsService.save(accidentRecords); + PageData pageData = new PageData(request); + if (CollUtil.isEmpty(pageData)){ + throw new RuntimeException("参数不能为空"); + } + accidentRecordsService.save(pageData); Map result = new HashMap<>(); result.put("result", "success"); return result; @@ -88,9 +90,13 @@ public class AccidentRecordsController extends BaseController { @RequestMapping("/update") public Map update(HttpServletRequest request) { PageData pageData = new PageData(request); - AccidentRecords accidentRecords = BeanUtil.mapToBean(pageData, AccidentRecords.class, true); - accidentRecords.setId(Optional.of(accidentRecords.getId()).orElseThrow(() -> new RuntimeException("id不能为空"))); - accidentRecordsService.update(accidentRecords); + if (CollUtil.isEmpty(pageData)){ + throw new RuntimeException("参数不能为空"); + } + if (pageData.get("id") == null) { + throw new RuntimeException("id不能为空"); + } + accidentRecordsService.update(pageData); Map result = new HashMap<>(); result.put("result", "success"); return result; diff --git a/src/main/java/com/zcloud/controller/door/MkmjRelationController.java b/src/main/java/com/zcloud/controller/door/MkmjRelationController.java new file mode 100644 index 00000000..1b079bb1 --- /dev/null +++ b/src/main/java/com/zcloud/controller/door/MkmjRelationController.java @@ -0,0 +1,187 @@ +package com.zcloud.controller.door; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.door.MkmjRelationService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.*; + +@Controller +@RequestMapping("/mkmjRelation") +public class MkmjRelationController extends BaseController { + + @Autowired + private MkmjRelationService mkmjRelationService; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @RequiresPermissions("mkmjDoor:add") + @ResponseBody + public Object add() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 添加人 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("ISDELETE", "0"); //是否删除 + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjRelationService.save(pd); + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @RequiresPermissions("mkmjDoor:del") + @ResponseBody + public Object delete() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + return mkmjRelationService.delete(pd); + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + @RequiresPermissions("mkmjDoor:edit") + @ResponseBody + public Object edit() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间 + return mkmjRelationService.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @RequiresPermissions("mkmjDoor:list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = mkmjRelationService.list(page); //列出Coursectk列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value="/listAllForArea") + @RequiresPermissions("mkmjDoor:list") + @ResponseBody + public Object listAllForArea() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = mkmjRelationService.listAllForArea(pd); //列出Coursectk列表 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @RequiresPermissions("mkmjDoor:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = mkmjRelationService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/findById") + @RequiresPermissions("mkmjDoor:edit") + @ResponseBody + public Object findById() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = mkmjRelationService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**定位 + * @param + * @throws Exception + */ + @RequestMapping(value="/savePosition") + @ResponseBody + public Object savePosition() throws Exception{ + PageData pd = new PageData(); + pd = this.getPageData(); + return mkmjRelationService.savePosition(pd); //根据ID读取 + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/getInfoList") + @RequiresPermissions("mkmjDoor:list") + @ResponseBody + public Object getInfoList(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + page.setPd(pd); + List varList = new ArrayList<>(); + varList = mkmjRelationService.getCarAndPeopleInfolistPage(page); //列出人闸机信息列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value="/getAllCarAndPeopleInfoCountByArea") + @ResponseBody + public Object getAllCarAndPeopleInfoCountByArea() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + List varList = mkmjRelationService.getAllCarAndPeopleInfoCountByArea(pd); //列出人闸机信息列表 + map.put("varList", varList); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/door/PlatformDoorVideoController.java b/src/main/java/com/zcloud/controller/door/PlatformDoorVideoController.java new file mode 100644 index 00000000..b865d3e5 --- /dev/null +++ b/src/main/java/com/zcloud/controller/door/PlatformDoorVideoController.java @@ -0,0 +1,207 @@ +package com.zcloud.controller.door; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.door.PlatformDoorVideoService; +import com.zcloud.util.Tools; +import com.zcloud.util.hk.HKPostApiUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：平台门禁管理 + */ +@Controller +@RequestMapping("/platform/door/video") +public class PlatformDoorVideoController extends BaseController { + @Autowired + private PlatformDoorVideoService platformDoorVideoService; + + private static final String door_host = "192.168.164.50:443"; + // 秘钥appkey + private static final String door_appKey = "24307012"; + // 秘钥appSecret + private static final String door_appSecret = "SLsUPf6WVR4uzu8NPdqq"; + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/add") + @ResponseBody + public Object add() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("PLATFORMDOORVIDEO_ID", this.get32UUID()); //主键 + platformDoorVideoService.save(pd); + map.put("result", errInfo); + return map; + } + + /**新增 + * @param + * @throws Exception + */ + @RequestMapping(value="/savePosition") + @ResponseBody + public Object savePosition() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if(pd.get("PLATFORMDOORVIDEO_ID") != null){ + platformDoorVideoService.edit(pd); + }else{ + pd.put("PLATFORMDOORVIDEO_ID", this.get32UUID()); //主键 + platformDoorVideoService.save(pd); + } + + map.put("result", errInfo); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/getHlsPathById") + @ResponseBody + public Object getHlsPathById() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + pd = platformDoorVideoService.findById(pd); + map = HKPostApiUtil.camerasPreviewURLs(door_host,door_appKey,door_appSecret,pd.getString("INDEXCODE"),"hls"); + map.put("pd",pd); + map.put("result", "success"); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/getHlsPath") + @ResponseBody + public Object getHlsPath() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + map = HKPostApiUtil.camerasPreviewURLs(door_host,door_appKey,door_appSecret,pd.getString("INDEXCODE"),"hls"); + map.put("result", "success"); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/getRtspPath") + @ResponseBody + public Object getRtspPath() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + map = HKPostApiUtil.camerasPreviewURLs(door_host,door_appKey,door_appSecret,pd.getString("INDEXCODE"),"rtsp"); + map.put("result", "success"); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/platformList") + @ResponseBody + public Object platformList() throws Exception{ + Map map = new HashMap(); + PageData pd =this.getPageData(); + map = HKPostApiUtil.cameraSearch(door_host,door_appKey,door_appSecret,pd); + map.put("result", "success"); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @ResponseBody + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + page.setPd(pd); + List varList = platformDoorVideoService.list(page); //列出Platformvideomanagement列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/listByPosition") + @ResponseBody + public Object listByPosition(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + double LONGITUDE = Double.parseDouble(pd.getString("LONGITUDE")); + double LATITUDE = Double.parseDouble(pd.getString("LATITUDE")); + pd.put("LONGITUDEONE", String.valueOf(LONGITUDE + 0.05)); + pd.put("LONGITUDETWO", String.valueOf(LONGITUDE - 0.05)); + pd.put("LATITUDEONE", String.valueOf(LATITUDE + 0.05)); + pd.put("LATITUDETWO", String.valueOf(LATITUDE - 0.05)); + page.setPd(pd); + List varList = platformDoorVideoService.listByPosition(page); //列出Platformvideomanagement列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/listAll") + @ResponseBody + public Object listAll() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List varList = new ArrayList<>(); + varList = platformDoorVideoService.listAll(pd); //列出Platformvideomanagement列表 + for (PageData data : varList) { + data.put("MAP_POINT_NAME", data.getString("NAME")); + } + map.put("varList", varList); + map.put("result", errInfo); + return map; + } + + /**列表 + * @throws Exception + */ + @RequestMapping(value="/delLocation") + @ResponseBody + public Object delLocation() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + platformDoorVideoService.delLocation(pd); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java b/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java index 13765cf4..4b99ab52 100644 --- a/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java +++ b/src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java @@ -209,6 +209,7 @@ public class AppFireRecordController extends BaseController { map.put("varList", res); return map; } + /** * @Description: 清单下的检查记录 * @Author: dearLin diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java index 3046d6f5..3c006006 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java @@ -797,6 +797,76 @@ public class AppGFBlindBoardController extends BaseController { return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFblindboardService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + PageData log = new PageData(); + log.put("BLINDBOARDLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("BLINDBOARD_ID", pd.get("BLINDBOARD_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); + + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + switch (status) { + + + case "6"://验收人 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFblindboardService.edit(pd2); + log.put("ACTION", "验收通过"); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + + break; + + case "-6"://验收人打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFblindboardService.edit(pd2); + + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + break; + default: + break; + } + GFblindBoardLogService.save(log); + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { @@ -1172,6 +1242,39 @@ public class AppGFBlindBoardController extends BaseController { map.put("result", errInfo); return map; } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess( + MultipartRequest request + ) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFblindboardService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); + + map.put("result", errInfo); + return map; + } private void saveImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { @@ -1179,7 +1282,12 @@ public class AppGFBlindBoardController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + } smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java index f5ed0b87..fdd60a18 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java @@ -256,6 +256,36 @@ public class AppGFBreakGroundController extends BaseController { map.put("result", errInfo); return map; } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess(MultipartRequest request) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFbreakGroundService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("BREAKGROUND_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); + + map.put("result", errInfo); + return map; + } private void saveImg(MultipartFile[] files,String signertime, String BREAKGROUND_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { @@ -263,7 +293,12 @@ public class AppGFBreakGroundController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + } smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); @@ -507,6 +542,80 @@ public class AppGFBreakGroundController extends BaseController { map.put("result", errInfo); return map; } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFbreakGroundService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + + PageData log = new PageData(); + log.put("BREAKGROUNDLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); + String HAZARD_IDENTIFICATION = (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") + + (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;"); + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + pd2.put("HAZARD_IDENTIFICATION", ""); + switch (status) { + + case "6"://验收人 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("BREAKGROUND_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFbreakGroundService.edit(pd2); + log.put("ACTION", "验收通过"); + + + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + break; + + case "-6"://审批打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFbreakGroundService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + break; + default: + break; + } + GFbreakGroundLogService.save(log); + this.sendNotice(pd); + map.put("result", errInfo); + return map; + } private void saveAcceptImg(MultipartFile[] files,String signertime, String BREAKGROUND_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java index d70ea087..57bd3cd7 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java @@ -735,6 +735,37 @@ public class AppGFConfinedSpaceController extends BaseController { map.put("result", errInfo); return map; } + + /**修改(单个文件上传接口) + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess(MultipartRequest request) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFconfinedspaceService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); + + map.put("result", errInfo); + return map; + } private void saveImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { @@ -742,7 +773,12 @@ public class AppGFConfinedSpaceController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + } else { + fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + } smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); @@ -868,6 +904,115 @@ public class AppGFConfinedSpaceController extends BaseController { map.put("result", errInfo); return map; } + + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFconfinedspaceService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + PageData log = new PageData(); + log.put("CONFINEDSPACELOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("CONFINEDSPACE_ID", pd.get("CONFINEDSPACE_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status)) { + pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;")); + } else if ("-2".equals(status) || "-3".equals(status) || "-4".equals(status) || "-5".equals(status) || "-6".equals(status)) { + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + } + + switch (status) { + case "6"://验收人 + + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + + + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFconfinedspaceService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "YX_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "有限空间作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-6"://验收人打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFconfinedspaceService.edit(pd2); + + // 发短信 + PageData mes4 = new PageData(); + mes4.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes4.put("templateCode", "YX_N06");// 短信模板编码 + mes4.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes4.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList4 = new ArrayList(); + // 第1个参数 + PageData params13 = new PageData(); + params13.put("name", "params1");// 存入短信模板中的参数名称 + params13.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList4.add(params13); + // 第2个参数 + PageData params14 = new PageData(); + params14.put("name", "params2");// 存入短信模板中的参数名称 + params14.put("value", "有限空间作业");// 存入上面参数名称所传递的值 + paramsList4.add(params14); + // 第3个参数 + PageData params15 = new PageData(); + params15.put("name", "params3");// 存入短信模板中的参数名称 + params15.put("value", "验收人");// 存入上面参数名称所传递的值 + paramsList4.add(params15); + sendMessageUtil.sendMessages(mes4, paramsList4); + break; + default: + break; + } + GFconfinedspaceLogService.save(log); + this.sendNotice(pd); + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { diff --git a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java index 1122ab23..0e21a104 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java @@ -613,6 +613,35 @@ public class AppGFCutRoadController extends BaseController { map.put("result", errInfo); return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess(MultipartRequest request) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFcutRoadService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("CUTROAD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); + + map.put("result", errInfo); + return map; + } private void saveImg(MultipartFile[] files,String signertime, String CUTROAD_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { @@ -620,7 +649,12 @@ public class AppGFCutRoadController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + } Smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); @@ -714,6 +748,80 @@ public class AppGFCutRoadController extends BaseController { return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFcutRoadService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + + PageData log = new PageData(); + log.put("CUTROADLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); +// String HAZARD_IDENTIFICATION = (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") + +// (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;"); + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); +// pd2.put("HAZARD_IDENTIFICATION", ""); + switch (status) { + + case "6"://验收人 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("BREAKGROUND_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); +// pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFcutRoadService.edit(pd2); + log.put("ACTION", "验收通过"); + + + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + + break; + + case "-6"://审批打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFcutRoadService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + break; + default: + break; + } + GFcutRoadLogService.save(log); + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String BREAKGROUND_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { diff --git a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java index dc83b16e..076255ba 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java @@ -554,6 +554,35 @@ public class AppGFElectricityController extends BaseController { map.put("result", errInfo); return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess(MultipartRequest request) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFelectricityService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); + + map.put("result", errInfo); + return map; + } private void saveImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { @@ -561,7 +590,12 @@ public class AppGFElectricityController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + } smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); @@ -693,6 +727,119 @@ public class AppGFElectricityController extends BaseController { return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFelectricityService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + PageData log = new PageData(); + log.put("ELECTRICITYLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + if ("2".equals(status) || "3".equals(status) || "4".equals(status)) { + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); + pd.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + } else if ("-2".equals(status) || "-3".equals(status) || "-4".equals(status) || "-5".equals(status)) { + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + } + + switch (status) { + + case "5"://验收人 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFelectricityService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "YD_Y05");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "临时用电安全作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + sendMessageUtil.sendMessages(mes, paramsList); + break; + + case "-5"://验收打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFelectricityService.edit(pd2); + + PageData mes3 = new PageData(); + mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes3.put("templateCode", "YD_N05");// 短信模板编码 + mes3.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes3.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList3 = new ArrayList(); + // 第1个参数 + PageData paramsc1 = new PageData(); + paramsc1.put("name", "params1");// 存入短信模板中的参数名称 + paramsc1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList3.add(paramsc1); + + // 第2个参数 + PageData paramsc2 = new PageData(); + paramsc2.put("name", "params2");// 存入短信模板中的参数名称 + paramsc2.put("value", "临时用电安全作业");// 存入上面参数名称所传递的值 + paramsList3.add(paramsc2); + // 第3个参数 + PageData paramsc3 = new PageData(); + paramsc3.put("name", "params3");// 存入短信模板中的参数名称 + paramsc3.put("value", "验收");// 存入上面参数名称所传递的值 + paramsList3.add(paramsc3); + sendMessageUtil.sendMessages(mes3, paramsList3); + break; + default: + break; + } + GFelectricityLogService.save(log); + + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java index 1538eea4..ca04b4b9 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java @@ -542,10 +542,10 @@ public class AppGFHighWorkController extends BaseController { * @param * @throws Exception */ - @RequestMapping(value="/editAcceptconfess") + @RequestMapping(value="/singleUpload/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess(MultipartRequest request) throws Exception { + public Object suEditAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -556,15 +556,14 @@ public class AppGFHighWorkController extends BaseController { pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 List fileList = new ArrayList(); String signertime = ""; - String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("HIGHWORK_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); - for (int i = 0; i < SIGNTIME.length; i++) { - signertime = SIGNTIME[i]; - fileList.add(request.getFile("file"+i)); - MultipartFile[] fileArr = new MultipartFile[fileList.size()]; - saveImg(fileList.toArray(fileArr),signertime,pd.getString("HIGHWORK_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); - fileList.clear(); - } map.put("result", errInfo); return map; } @@ -575,7 +574,12 @@ public class AppGFHighWorkController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + } smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); @@ -681,6 +685,126 @@ public class AppGFHighWorkController extends BaseController { GFhighworkService.edit(pd2); + // 发短信 + PageData mes3 = new PageData(); + mes3.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes3.put("templateCode", "GK_N06");// 短信模板编码 + mes3.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes3.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList3 = new ArrayList(); + // 第1个参数 + PageData params10 = new PageData(); + params10.put("name", "params1");// 存入短信模板中的参数名称 + params10.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList3.add(params10); + // 第2个参数 + PageData params11 = new PageData(); + params11.put("name", "params2");// 存入短信模板中的参数名称 + params11.put("value", "高空作业");// 存入上面参数名称所传递的值 + paramsList3.add(params11); + // 第3个参数 + PageData params12 = new PageData(); + params12.put("name", "params3");// 存入短信模板中的参数名称 + params12.put("value", "验收人");// 存入上面参数名称所传递的值 + paramsList3.add(params12); + sendMessageUtil.sendMessages(mes3, paramsList3); + break; + default: + break; + } + GFhighWorkLogService.save(log); + map.put("result", errInfo); + return map; + } + + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFhighworkService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 +// pd2.put("OTHER_PROTECTIVE_MEASURES", pd.get("OTHER_PROTECTIVE_MEASURES")); //修改人 +// pd2.put("HAZARD_IDENTIFICATION", pd.get("HAZARD_IDENTIFICATION")); //修改人 + PageData log = new PageData(); + log.put("HIGHWORKLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("HIGHWORK_ID", pd.get("HIGHWORK_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String OTHER_PROTECTIVE_MEASURES = pd2.getString("OTHER_PROTECTIVE_MEASURES"); + if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status)) { + OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); +// pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + +// (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;")); +// pd2.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") + +// (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;")); + } else if ("-2".equals(status) || "-3".equals(status) || "-4".equals(status) || "-5".equals(status) || "-6".equals(status)) { + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); +// pd2.put("HAZARD_IDENTIFICATION", ""); + } + switch (status) { + + case "6"://验收人 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("HIGHWORK_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFhighworkService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes.put("templateCode", "GK_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "高空作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + sendMessageUtil.sendMessages(mes, paramsList); + + break; + case "-6"://验收人打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFhighworkService.edit(pd2); + + // 发短信 PageData mes3 = new PageData(); mes3.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java index 8a2e7510..0cd4d373 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java @@ -519,6 +519,35 @@ public class AppGFHoistingController extends BaseController { map.put("result", errInfo); return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptconfess") + @ResponseBody + @Transactional + public Object suEditAcceptconfess(MultipartRequest request) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFhoistingService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); + + map.put("result", errInfo); + return map; + } private void saveImg(MultipartFile[] files,String signertime, String HOISTING_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { @@ -526,7 +555,12 @@ public class AppGFHoistingController extends BaseController { pd = this.getPageData(); MultipartFile file = files[i]; String ffile = DateUtil.getDays(); - String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + String fileName; + if (file.getOriginalFilename() == null) { + fileName = ".PNG"; + }else { + fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + } Smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); @@ -622,6 +656,121 @@ public class AppGFHoistingController extends BaseController { break; + case "-6"://审批打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFhoistingService.edit(pd2); + + + // 发短信 + PageData mes3 = new PageData(); + mes3.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes3.put("templateCode", "DZ_N06");// 短信模板编码 + mes3.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes3.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList3 = new ArrayList(); + // 第1个参数 + PageData params10 = new PageData(); + params10.put("name", "params1");// 存入短信模板中的参数名称 + params10.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList3.add(params10); + // 第2个参数 + PageData params11 = new PageData(); + params11.put("name", "params2");// 存入短信模板中的参数名称 + params11.put("value", "吊装作业");// 存入上面参数名称所传递的值 + paramsList3.add(params11); + // 第3个参数 + PageData params12 = new PageData(); + params12.put("name", "params3");// 存入短信模板中的参数名称 + params12.put("value", "验收");// 存入上面参数名称所传递的值 + paramsList3.add(params12); + sendMessageUtil.sendMessages(mes3, paramsList3); + break; + default: + break; + } + GFhighWorkLogService.save(log); + map.put("result", errInfo); + return map; + } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/singleUpload/editAcceptStatus") + @ResponseBody + @Transactional + public Object suEditAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFhoistingService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 +// pd2.put("OTHER_PROTECTIVE_MEASURES", pd.get("OTHER_PROTECTIVE_MEASURES")); //修改人 +// pd2.put("HAZARD_IDENTIFICATION", pd.get("HAZARD_IDENTIFICATION")); //修改人 + PageData log = new PageData(); + log.put("HOISTINGLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("HOISTING_ID", pd.get("HOISTING_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); +// String HAZARD_IDENTIFICATION = (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") + +// (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;"); + + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); +// pd2.put("HAZARD_IDENTIFICATION", ""); + switch (status) { + + case "6"://验收人 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME = pd.getString("SIGNTIME"); + + signertime = SIGNTIME; + fileList.add(request.getFile("file")); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFhoistingService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes.put("templateCode", "DZ_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "吊装作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + sendMessageUtil.sendMessages(mes, paramsList); + + break; + + case "-6"://审批打回 log.put("ACTION", "验收人打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java index 4bfea969..49b30015 100644 --- a/src/main/java/com/zcloud/controller/map/MapController.java +++ b/src/main/java/com/zcloud/controller/map/MapController.java @@ -7,6 +7,10 @@ import com.zcloud.controller.map.testDto.TestDto; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.bus.CorpInfoService; +import com.zcloud.service.door.MkmjDeviceService; +import com.zcloud.service.door.MkmjPathService; +import com.zcloud.service.door.MkmjRelationService; +import com.zcloud.service.door.PlatformDoorVideoService; import com.zcloud.service.dw.DwService; import com.zcloud.service.dw.dto.*; import com.zcloud.service.keyProjects.VideoManagerService; @@ -30,6 +34,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -81,7 +86,14 @@ public class MapController extends BaseController { private WeatherUtil weatherUtil; @Resource private DwService dwService; - + @Autowired + private MkmjRelationService mkmjRelationService; + @Autowired + private MkmjDeviceService mkmjDeviceService; + @Autowired + private PlatformDoorVideoService platformDoorVideoService; + @Autowired + private MkmjPathService mkmjPathService; @ResponseBody @RequestMapping("/getCorpInfo") public Object getCorpInfo() throws Exception { @@ -745,11 +757,24 @@ public class MapController extends BaseController { */ @RequestMapping("/getGatesInAndOutListById") @ResponseBody - public ReturnMap getGatesInAndOutListById(Page page) { + public ReturnMap getGatesInAndOutListById(Page page) throws Exception { ReturnMap returnMap = new ReturnMap(); PageData pd = this.getPageData(); + pd.put("DOOR_ID", pd.get("GATE_AREA_ID")); page.setPd(pd); - List recordAllList = gateMachineService.getPersonRecordListAllByEId(page); + List recordAllList = Collections.emptyList(); + if (!Tools.isEmpty(pd.getString("CORPINFO_ID"))) { //各公司的二级口门门禁记录 + page.setCurrentPage(1); + page.setShowCount(10); + recordAllList = mkmjPathService.getPeopleInfolistPageByMap(page); //列出人闸机信息列表 + // 车辆进出记录 + List carRecordAllList = mkmjPathService.getCraInfolistPageByMap(page); + returnMap.put("carRecordAllList", carRecordAllList); + }else{ + recordAllList = gateMachineService.getPersonRecordListAllByEId(page); + } + + returnMap.put("recordAllList", recordAllList); return returnMap; } @@ -1168,4 +1193,65 @@ public class MapController extends BaseController { map.put("result", errInfo); return map; } + + /** + * @Description: 闸机位置 + * @Author: dearLin + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/getDoorCount") + @ResponseBody + public ReturnMap getDoorCount() throws Exception { + ReturnMap returnMap = new ReturnMap(); + PageData data = new PageData(); + PageData pageData = this.getPageData(); + //人闸机 + pageData.put("DEVICE_TYPE", 0); + List personMachine = mkmjDeviceService.listAll(pageData); + data.put("personMachineCount", personMachine.size()); + //车闸机 + pageData.put("DEVICE_TYPE", 1); + List carMachine = mkmjDeviceService.listAll(pageData); + data.put("carMachineCount", carMachine.size()); + //摄像头数 + List camera = platformDoorVideoService.listAll(pageData); + data.put("cameraCount", camera.size()); + returnMap.put("data", data); + return returnMap; + } + + /** + * @Description: 闸机位置 + * @Author: dearLin + * @Date: 2023/9/23/023 9:04 + * @Param: + * @Return: + */ + @RequestMapping("/getDoorRecord") + @ResponseBody + public ReturnMap getDoorRecord() { + ReturnMap returnMap = new ReturnMap(); + PageData pageData = this.getPageData(); + List dataList = new ArrayList<>(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String fendDate = format.format(new Date()); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, 0); // 将时设置为0 + calendar.set(Calendar.MINUTE, 0); // 将分设置为0 + calendar.set(Calendar.SECOND, 0); // 将秒设置为0 + calendar.set(Calendar.MILLISECOND, 0); // 将毫秒设置为0 + Date currDay = calendar.getTime(); + String fstartDate = format.format(currDay); + if (pageData.get("TYPE").equals("0")) { + pageData.put("eventTime", fstartDate); + dataList = mkmjRelationService.findPersonRecord(pageData); + } else { + pageData.put("CROSSTIME", fstartDate); + dataList = mkmjRelationService.findCarRecord(pageData); + } + returnMap.put("varList", dataList); + return returnMap; + } } diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 65cf57f4..d3b50f18 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -915,11 +915,14 @@ public class UsersController extends BaseController { pd.put("IP", ""); //IP pd.put("STATUS", "0"); //状态 pd.put("ISMAIN", "0"); //状态 - pd.put("ISDELETE", "1"); //是否删除，0表示不删除 +// pd.put("ISDELETE", "1"); //是否删除，0表示不删除 + // 人员中台暂时不用 + pd.put("ISDELETE", "0"); //是否删除，0表示不删除 pd.put("SKIN", "pcoded-navbar navbar-image-3,navbar pcoded-header navbar-expand-lg navbar-light header-dark,"); //用户默认皮肤 pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("USERNAME"), pd.getString("PASSWORD")).toString()); //密码加密 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); pd.put("ISPUSH", "0"); + // 人员中台暂时不用 Map resultMap = doCheck(pd.getString("USERNAME"), pd.getString("USER_ID_CARD"), ""); if (resultMap.get("result").equals("success")) { if (null == usersService.findByUsername(pd)) { //判断用户名是否存在 @@ -1049,7 +1052,7 @@ public class UsersController extends BaseController { PageData pd = new PageData(); String errInfo = "success"; pd = this.getPageData(); - Map returnMap = null; + Map returnMap = new HashMap(); if (pd.getString("ISPUSH").equals("1")) { // ------联通人员定位删除人员用------ @@ -1066,6 +1069,8 @@ public class UsersController extends BaseController { String UserDto = JSON.toJSONString(param); String result = HttpClientUtilDoGet.sendHttpPost(tongBuUrl + "/docking/core/user/addOrUpdate", UserDto,param); returnMap = (Map) JSON.parse(result); + // TODO com.alibaba.fastjson.JSONException: syntax error, pos 1 暂时不用人员中台 + returnMap.put("result", "success"); } if (pd.getString("ISPUSH").equals("0") || returnMap.get("result").equals("success")) { @@ -2498,9 +2503,23 @@ public class UsersController extends BaseController { return doCheck(param.get("USERNAME"),param.get("CARD_NO"),param.get("USER_ID")); } + /** + * 检查人员中台用户是否存在 + * + * @param USERNAME 用户名 + * @param CARD_NO 身份证号 + * @param USER_ID 用户id + * @return map + * @throws Exception + * @author water_xu + * @date 2024-9-29 + */ public Map doCheck(String USERNAME, String CARD_NO, String USER_ID) throws Exception { String result = HttpClientUtilDoGet.sendHttpGet(tongBuUrl + "/docking/core/user/getCheck"+"?USERNAME="+USERNAME+"&CARD_NO="+CARD_NO+"&USER_ID="+USER_ID); Map returnMap = (Map) JSON.parse(result); + // 人员中台暂时不用 +// Map returnMap = new HashMap<>(); +// returnMap.put("result", "success"); return returnMap; } @@ -2590,115 +2609,4 @@ public class UsersController extends BaseController { } return returnMap; } - - static String CREATOR = null; - static String OPERATOR = null; - @RequestMapping(value = "/initCore") - @ResponseBody - public Object initCore() throws Exception { - - PageData p1d = new PageData(); -// pd = this.getPageData(); - if (CREATOR == null) { - CREATOR = Jurisdiction.getUSER_ID(); - OPERATOR = Jurisdiction.getUSER_ID(); - } - List pageData = usersService.listAllUser(p1d); - - for (PageData pd : pageData) { - try { - pd.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间 - pd.put("CREATOR", CREATOR); //创建人 - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - pd.put("OPERATOR", OPERATOR); //修改人 - PageData sexPd = new PageData(); - if (Tools.notEmpty(pd.getString("SEX"))) { - sexPd.put("DICTIONARIES_ID", pd.getString("SEX")); - PageData byId = dictionariesService.findById(sexPd); - if (Tools.notEmpty(byId)) { - pd.put("SEX", byId.getString("NAME")); - } - } - StringBuilder ORG_PATH = new StringBuilder(); - boolean hasPid = true; - PageData department = departmentService.findById(pd); - if (department != null) { - ORG_PATH.insert(0, department.getString("NAME")); - String deptId = department.getString("PARENT_ID"); - PageData deptPd = new PageData(); - deptPd.put("DEPARTMENT_ID", deptId); - if (!"0".equals(department.get("PARENT_ID"))) { - while (hasPid) { - PageData dept = departmentService.findById(deptPd); - if ("0".equals(dept.get("PARENT_ID"))) { - hasPid = false; - } else { - deptId = dept.getString("PARENT_ID"); - deptPd.put("DEPARTMENT_ID", deptId); - } - ORG_PATH.insert(0, dept.getString("NAME") + "/"); - } - } - pd.put("ORG_PATH", ORG_PATH); - } else { - ORG_PATH.insert(0, ""); - - - } - PageData CorpName = corpInfoService.findById(pd); - - - pd.put("CORPINFO_NAME", CorpName == null ? "" : CorpName.getString("CORP_NAME")); - pd.put("USER_TYPE", "1"); - - HashMap param = new HashMap<>(); - Set set = pd.keySet(); - for (Object key : set) { - param.put(key.toString(), pd.getString(key.toString())); - } - - - //要推送的照片集合 - List userPhotoDTOList = new ArrayList<>(); - //人脸照片 - PageData photoPd = new PageData(); - photoPd.put("USER_PHOTO_ID", pd.getString("IMGFILES_ID")); - photoPd.put("USER_ID", pd.getString("FOREIGN_KEY")); - photoPd.put("PHOTO_URL", pd.getString("FILEPATH")); - photoPd.put("PHOTO_TYPE", "1"); - photoPd.put("ISDELETE", "0"); - userPhotoDTOList.add(photoPd); - param.put("userPhotoDTOList", userPhotoDTOList); - String userResult = HttpClientUtilDoGet.sendHttpGet(tongBuUrl + "/docking/core/user/getUserInfoById" + "?USER_ID=" + pd.getString("USER_ID")); - Map userReturnMap = (Map) JSON.parse(userResult); - if (userReturnMap.get("USERINFO") != null) { //有用户数据获取修改信息 - PageData userInfoPd = JSON.parseObject(userReturnMap.get("USERINFO").toString(), PageData.class); - String updateDescription = UpdateEnum.getUpdateDescription(userInfoPd, pd); - param.put("REMARKS", updateDescription); - - } else { //没有数据则获取新增信息 - String insertDescription = UpdateEnum.getInsertDescription(pd); - param.put("REMARKS", insertDescription); - } - String UserDto = JSON.toJSONString(param); - String result = HttpClientUtilDoGet.sendHttpPost(tongBuUrl + "/docking/core/user/addOrUpdate", UserDto, null); - Map returnMap = (Map) JSON.parse(result); - if (returnMap.get("result").equals("success")) { - PageData pushPd = new PageData(); - pushPd.put("ISPUSH", "1"); - if (!Tools.isEmpty(pd.get("operateType")) && pd.getString("operateType").equals("delete")) { - pushPd.put("ISDELETE", "1"); - } else { - pushPd.put("ISDELETE", "0"); - } - pushPd.put("USER_ID", pd.getString("USER_ID")); - usersService.editPushStatus(pushPd); - } - }catch (Exception e){ - - } - } - - return null; - } } diff --git a/src/main/java/com/zcloud/mapper/dsno2/door/DoorAreaMapper.java b/src/main/java/com/zcloud/mapper/dsno2/door/DoorAreaMapper.java new file mode 100644 index 00000000..c1669b37 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/door/DoorAreaMapper.java @@ -0,0 +1,71 @@ +package com.zcloud.mapper.dsno2.door; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface DoorAreaMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + List batchDevicelistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /**. + * 校验名称是否重复 修改时传入数据id + * @param pageData + * @return + */ + PageData findByOnly(PageData pageData); + + List carAndPersonInOutCount(PageData pd); + + List getAllByMap(PageData pageData); +} + diff --git a/src/main/java/com/zcloud/mapper/dsno2/door/MkmjDeviceMapper.java b/src/main/java/com/zcloud/mapper/dsno2/door/MkmjDeviceMapper.java new file mode 100644 index 00000000..05ec48ce --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/door/MkmjDeviceMapper.java @@ -0,0 +1,74 @@ + +package com.zcloud.mapper.dsno2.door; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjDeviceMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + List listAllForArea(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /**. + * 校验名称是否重复 修改时传入数据id + * @param pageData + * @return + */ + PageData findByOnly(PageData pageData); + + /** + * 定位 + * @param pd + */ + void savePosition(PageData pd); +} + diff --git a/src/main/java/com/zcloud/mapper/dsno2/door/MkmjDoorVideoMapper.java b/src/main/java/com/zcloud/mapper/dsno2/door/MkmjDoorVideoMapper.java new file mode 100644 index 00000000..61b5266d --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/door/MkmjDoorVideoMapper.java @@ -0,0 +1,73 @@ +package com.zcloud.mapper.dsno2.door; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + + +/** + * 说明：门口门禁闸机摄像头 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjDoorVideoMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /** + * 定位 + * @param pd + */ + void savePosition(PageData pd); + + /**. + * 校验名称是否重复 修改时传入数据id + * @param pageData + * @return + */ + PageData findByOnly(PageData pageData); + + List getRelevanceDoor(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/dsno2/door/MkmjPathMapper.java b/src/main/java/com/zcloud/mapper/dsno2/door/MkmjPathMapper.java new file mode 100644 index 00000000..32a06554 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/door/MkmjPathMapper.java @@ -0,0 +1,77 @@ +package com.zcloud.mapper.dsno2.door; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjPathMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + List getPeopleInfolistPage(Page page); + + List getCarInfolistPage(Page page); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /**. + * 校验名称是否重复 修改时传入数据id + * @param pageData + * @return + */ + PageData findByOnly(PageData pageData); + + /** + * 定位 + * @param pd + */ + void savePosition(PageData pd); + + +} + diff --git a/src/main/java/com/zcloud/mapper/dsno2/door/MkmjRelationMapper.java b/src/main/java/com/zcloud/mapper/dsno2/door/MkmjRelationMapper.java new file mode 100644 index 00000000..ab8573cd --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/door/MkmjRelationMapper.java @@ -0,0 +1,81 @@ +package com.zcloud.mapper.dsno2.door; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjRelationMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + List listAllForArea(PageData pd); + + List getAllCarAndPeopleInfoCountByArea(PageData pd); + + List getCarAndPeopleInfolistPage(Page page); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /**. + * 校验名称是否重复 修改时传入数据id + * @param pageData + * @return + */ + PageData findByOnly(PageData pageData); + + /** + * 定位 + * @param pd + */ + void savePosition(PageData pd); + + List findPersonRecord(PageData pageData); + + List findCarRecord(PageData pageData); +} + diff --git a/src/main/java/com/zcloud/mapper/dsno2/door/PlatformDoorVideoMapper.java b/src/main/java/com/zcloud/mapper/dsno2/door/PlatformDoorVideoMapper.java new file mode 100644 index 00000000..3393207f --- /dev/null +++ b/src/main/java/com/zcloud/mapper/dsno2/door/PlatformDoorVideoMapper.java @@ -0,0 +1,78 @@ +package com.zcloud.mapper.dsno2.door; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：平台视频管理 + * 作者：luoxiaobao + * 时间：2023-07-21 + * 官网：www.zcloudchina.com + */ +public interface PlatformDoorVideoMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表 + * @param page + * @throws Exception + */ + List listByPositionlistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**通过indexcode获取数据 + * @param pd + * @throws Exception + */ + PageData findByCode(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + + /**清空坐标 + * @param pd + * @throws Exception + */ + void delLocation(PageData pd); + + +} + diff --git a/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java b/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java index 8ed30d49..2d003b70 100644 --- a/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java +++ b/src/main/java/com/zcloud/service/accident/AccidentRecordsService.java @@ -2,7 +2,6 @@ package com.zcloud.service.accident; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.entity.accident.AccidentRecords; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -29,16 +28,16 @@ public interface AccidentRecordsService { /** * 新增 * - * @param accidentRecords 要保存的实体 + * @param pageData 要保存的实体 */ - void save(AccidentRecords accidentRecords); + void save(PageData pageData); /** * 修改 * * @param bean 要修改的实体 */ - void update(AccidentRecords bean); + void update(PageData pageData); /** * 删除 diff --git a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java index f3777606..7cae2184 100644 --- a/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java +++ b/src/main/java/com/zcloud/service/accident/impl/AccidentRecordsServiceImpl.java @@ -1,6 +1,8 @@ package com.zcloud.service.accident.impl; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; @@ -25,7 +27,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.lang.reflect.Field; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -58,27 +59,69 @@ public class AccidentRecordsServiceImpl implements AccidentRecordsService { @Override @Transactional(rollbackFor = Exception.class) - public void save(AccidentRecords accidentRecords) { + public void save(PageData pageData) { + AccidentRecords accidentRecords = new AccidentRecords(); accidentRecords.setId(IdUtil.fastSimpleUUID()); accidentRecords.setCreatedBy(Jurisdiction.getUsername()); - Date date = new Date(); - SimpleDateFormat dateFormat = new SimpleDateFormat(DatePattern.NORM_DATETIME_PATTERN); - // 设置成东八区时间 - dateFormat.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); - - DateUtil.parse(dateFormat.format(date), DatePattern.NORM_DATETIME_PATTERN); accidentRecords.setIsDeleted(0); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId(); accidentRecords.setCorpinfoId(corpinfoId); + accidentRecords.setIncidentNumber(pageData.getString("incidentNumber")); + accidentRecords.setIncidentName(pageData.getString("incidentName")); + accidentRecords.setIncidentType(pageData.getString("incidentType")); + accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); + accidentRecords.setLocation(pageData.getString("location")); + accidentRecords.setFatalities(Convert.toInt(pageData.get("fatalities"))); + + DateTime time = DateUtil.parse(pageData.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); + accidentRecords.setIncidentDate(time); + DateTime time1 = DateUtil.parse(pageData.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); + accidentRecords.setReportDate(time1); + + accidentRecords.setDirectLoss(Convert.toInt(pageData.get("directLoss"))); + accidentRecords.setInjured(Convert.toInt(pageData.get("injured"))); + accidentRecords.setSeriouslyInjured(Convert.toInt(pageData.get("seriouslyInjured"))); + accidentRecords.setCause(pageData.getString("cause")); + accidentRecords.setSummary(pageData.getString("summary")); + accidentRecords.setAnalysis(pageData.getString("analysis")); + accidentRecords.setSuggestions(pageData.getString("suggestions")); + accidentRecords.setMeasures(pageData.getString("measures")); + accidentRecords.setCreator(pageData.getString("creator")); + accidentRecords.setPhotos(pageData.getString("photos")); Assert.isTrue(accidentRecordsMapper.save(accidentRecords) == 1, "新增事故记录失败"); } @Override @Transactional(rollbackFor = Exception.class) - public void update(AccidentRecords accidentRecords) { + public void update(PageData pageData) { + AccidentRecords accidentRecords = new AccidentRecords(); + accidentRecords.setIncidentNumber(pageData.getString("incidentNumber")); + accidentRecords.setId(pageData.getString("id")); + accidentRecords.setIncidentName(pageData.getString("incidentName")); + accidentRecords.setIncidentType(pageData.getString("incidentType")); + accidentRecords.setIncidentLevel(pageData.getString("incidentLevel")); + accidentRecords.setLocation(pageData.getString("location")); + accidentRecords.setFatalities(Convert.toInt(pageData.get("fatalities"))); + + DateTime time = DateUtil.parse(pageData.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); + accidentRecords.setIncidentDate(time); + DateTime time1 = DateUtil.parse(pageData.getString("incidentDate"), "yyyy-MM-dd HH:mm:ss"); + accidentRecords.setReportDate(time1); + + accidentRecords.setDirectLoss(Convert.toInt(pageData.get("directLoss"))); + accidentRecords.setInjured(Convert.toInt(pageData.get("injured"))); + accidentRecords.setSeriouslyInjured(Convert.toInt(pageData.get("seriouslyInjured"))); + accidentRecords.setCause(pageData.getString("cause")); + accidentRecords.setSummary(pageData.getString("summary")); + accidentRecords.setAnalysis(pageData.getString("analysis")); + accidentRecords.setSuggestions(pageData.getString("suggestions")); + accidentRecords.setMeasures(pageData.getString("measures")); + accidentRecords.setCreator(pageData.getString("creator")); + accidentRecords.setPhotos(pageData.getString("creator")); accidentRecords.setUpdatedBy(Jurisdiction.getUsername()); accidentRecords.setUpdatedTime(new Date()); + accidentRecords.setPhotos(pageData.getString("photos") == null ? null : pageData.getString("photos")); String corpinfoId = StrUtil.isEmpty(accidentRecords.getCorpinfoId()) ? Jurisdiction.getCORPINFO_ID() : accidentRecords.getCorpinfoId(); accidentRecords.setCorpinfoId(corpinfoId); Assert.isTrue(accidentRecordsMapper.updateById(accidentRecords) == 1, "更新事故记录失败"); diff --git a/src/main/java/com/zcloud/service/door/DoorAreaService.java b/src/main/java/com/zcloud/service/door/DoorAreaService.java new file mode 100644 index 00000000..2389d3f6 --- /dev/null +++ b/src/main/java/com/zcloud/service/door/DoorAreaService.java @@ -0,0 +1,59 @@ +package com.zcloud.service.door; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface DoorAreaService { + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + public List listForDevice(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + public List carAndPersonInOutCount(PageData pd)throws Exception; + + + List getAllByMap(PageData pageData); +} + diff --git a/src/main/java/com/zcloud/service/door/MkmjDeviceService.java b/src/main/java/com/zcloud/service/door/MkmjDeviceService.java new file mode 100644 index 00000000..b6ea4bc3 --- /dev/null +++ b/src/main/java/com/zcloud/service/door/MkmjDeviceService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.door; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjDeviceService { + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + public List listAllForArea(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public Object deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /** + * 定位 + * @param pd + * @return + */ + Object savePosition(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/door/MkmjPathService.java b/src/main/java/com/zcloud/service/door/MkmjPathService.java new file mode 100644 index 00000000..e57c04e5 --- /dev/null +++ b/src/main/java/com/zcloud/service/door/MkmjPathService.java @@ -0,0 +1,74 @@ +package com.zcloud.service.door; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjPathService { + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + public List getPeopleInfolistPage(Page page)throws Exception; + + public List getCarInfolistPage(Page page)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public Object deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /** + * 定位 + * @param pd + * @return + */ + Object savePosition(PageData pd); + + + List getPeopleInfolistPageByMap(Page page)throws Exception; + + List getCraInfolistPageByMap(Page page)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/door/MkmjRelationService.java b/src/main/java/com/zcloud/service/door/MkmjRelationService.java new file mode 100644 index 00000000..4fc0f3d9 --- /dev/null +++ b/src/main/java/com/zcloud/service/door/MkmjRelationService.java @@ -0,0 +1,75 @@ +package com.zcloud.service.door; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +public interface MkmjRelationService { + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + public List listAllForArea(PageData pd)throws Exception; + + public List getAllCarAndPeopleInfoCountByArea(PageData pd)throws Exception; + + public List getCarAndPeopleInfolistPage(Page page)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public Object deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /** + * 定位 + * @param pd + * @return + */ + Object savePosition(PageData pd); + + List findPersonRecord(PageData pageData); + + List findCarRecord(PageData pageData); +} + diff --git a/src/main/java/com/zcloud/service/door/PlatformDoorVideoService.java b/src/main/java/com/zcloud/service/door/PlatformDoorVideoService.java new file mode 100644 index 00000000..1bad97d0 --- /dev/null +++ b/src/main/java/com/zcloud/service/door/PlatformDoorVideoService.java @@ -0,0 +1,76 @@ +package com.zcloud.service.door; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：平台视频管理 + * 作者：luoxiaobao + * 时间：2023-07-21 + * 官网：www.zcloudchina.com + */ +public interface PlatformDoorVideoService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List listByPosition(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**通过indexcode获取数据 + * @param pd + * @throws Exception + */ + public PageData findByCode(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + /**清空坐标 + * @param pd + * @throws Exception + */ + void delLocation(PageData pd); +} + diff --git a/src/main/java/com/zcloud/service/door/impl/DoorAreaServiceImpl.java b/src/main/java/com/zcloud/service/door/impl/DoorAreaServiceImpl.java new file mode 100644 index 00000000..73cddc05 --- /dev/null +++ b/src/main/java/com/zcloud/service/door/impl/DoorAreaServiceImpl.java @@ -0,0 +1,162 @@ +package com.zcloud.service.door.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.door.DoorAreaMapper; +import com.zcloud.mapper.dsno2.door.MkmjPathMapper; +import com.zcloud.service.door.DoorAreaService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class DoorAreaServiceImpl implements DoorAreaService { + + @Autowired + private DoorAreaMapper doorAreaMapper; + + @Autowired + private MkmjPathMapper mkmjAreaGateMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + //保存校验名称不重复 + PageData pageData = doorAreaMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(ObjectUtils.isEmpty(pageData)){ + pd.put("AREA_ID", UuidUtil.get32UUID()); + }else { + map.put("result", "fail"); + map.put("msg", "名称已存在，请修改后重新提交"); + return map; + } + doorAreaMapper.save(pd); + map.put("result", errInfo); + map.put("msg", "保存成功"); + return map; + } + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + //校验区域下是否存在口门，存在则不让删除 + List gateList = mkmjAreaGateMapper.listAll(pd); + if(gateList.size()>0){ + map.put("result", "fail"); + map.put("msg", "当前区域还存在闸机，请删除当前区域的所有闸机后进行删除"); + return map; + } + //两个校验都不存在 则可以删除 + doorAreaMapper.delete(pd); + map.put("result", errInfo); + map.put("msg", "删除成功"); + return map; + } + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pageData = doorAreaMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(!ObjectUtils.isEmpty(pageData)){ + map.put("result", "fail"); + map.put("msg", "名称已存在，请修改后重新提交"); + return map; + } + doorAreaMapper.edit(pd); + map.put("result", errInfo); + map.put("msg", "编辑成功"); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return doorAreaMapper.datalistPage(page); + } + + /**列表 + * @param page + * @throws Exception + */ + public List listForDevice(Page page)throws Exception{ + return doorAreaMapper.batchDevicelistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return doorAreaMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return doorAreaMapper.findById(pd); + } + + @Override + public List carAndPersonInOutCount(PageData pd) throws Exception { + return doorAreaMapper.carAndPersonInOutCount(pd); + } + /** + * 方法名称：地图显示本公司的口门信息和坐标信息 + * 方法描述： + * 创建人：guoyuepeng + * 时间：2024/9/5 14:46 + * @param pageData + * @return java.util.List + */ + @Override + public List getAllByMap(PageData pageData) { + List list = doorAreaMapper.getAllByMap(pageData); + List valueList = new ArrayList<>(); + for (PageData pd : list){ //整理成通用List + PageData valueMap = new PageData(); + valueMap.put("GATE_AREA_NAME",pd.getString("DOOR_NAME")); + valueMap.put("LATITUDE",pd.getString("LATITUDE")); + valueMap.put("LONGITUDE",pd.getString("LONGITUDE")); + valueMap.put("GATE_NAME",pd.getString("DOOR_NAME")); + valueMap.put("MAP_POINT_NAME",pd.getString("DOOR_NAME")); + valueMap.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + valueMap.put("id",pd.getString("DOOR_ID")); + valueList.add(valueMap); + } + return valueList; + } + +} + diff --git a/src/main/java/com/zcloud/service/door/impl/MkmjDeviceServiceImpl.java b/src/main/java/com/zcloud/service/door/impl/MkmjDeviceServiceImpl.java new file mode 100644 index 00000000..a808c93a --- /dev/null +++ b/src/main/java/com/zcloud/service/door/impl/MkmjDeviceServiceImpl.java @@ -0,0 +1,143 @@ + +package com.zcloud.service.door.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.door.MkmjDeviceMapper; +import com.zcloud.service.door.MkmjDeviceService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MkmjDeviceServiceImpl implements MkmjDeviceService { + + @Autowired + private MkmjDeviceMapper mkmjDeviceMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + //保存校验名称不重复 + PageData pageData = mkmjDeviceMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(ObjectUtils.isEmpty(pageData)){ + pd.put("DEVICE_ID", UuidUtil.get32UUID()); + }else { + map.put("result", "fail"); + map.put("msg", "名称已存在，请修改后重新提交"); + return map; + } + mkmjDeviceMapper.save(pd); + map.put("result", errInfo); + map.put("msg", "保存成功"); + return map; + } + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + mkmjDeviceMapper.delete(pd); + map.put("result", errInfo); + map.put("msg", "删除成功"); + return map; + } + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pageData = mkmjDeviceMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(!ObjectUtils.isEmpty(pageData)){ + map.put("result", "fail"); + map.put("msg", "名称已存在，请修改后重新提交"); + return map; + } + mkmjDeviceMapper.edit(pd); + map.put("result", errInfo); + map.put("msg", "编辑成功"); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return mkmjDeviceMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return mkmjDeviceMapper.listAll(pd); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllForArea(PageData pd)throws Exception{ + return mkmjDeviceMapper.listAllForArea(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return mkmjDeviceMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public Object deleteAll(String[] ArrayDATA_IDS)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + mkmjDeviceMapper.deleteAll(ArrayDATA_IDS); + map.put("result", errInfo); + map.put("msg", "删除成功"); + return map; + } + + @Override + public Object savePosition(PageData pd) { + Map map = new HashMap(); + String errInfo = "success"; + mkmjDeviceMapper.savePosition(pd); + map.put("result", errInfo); + map.put("msg", "定位成功"); + return map; + } + +} + diff --git a/src/main/java/com/zcloud/service/door/impl/MkmjPathServiceImpl.java b/src/main/java/com/zcloud/service/door/impl/MkmjPathServiceImpl.java new file mode 100644 index 00000000..05d4d44f --- /dev/null +++ b/src/main/java/com/zcloud/service/door/impl/MkmjPathServiceImpl.java @@ -0,0 +1,200 @@ +package com.zcloud.service.door.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.door.MkmjPathMapper; +import com.zcloud.service.door.MkmjPathService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MkmjPathServiceImpl implements MkmjPathService { + + @Autowired + private MkmjPathMapper mkmjPathMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + //保存校验名称不重复 + PageData pageData = mkmjPathMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(ObjectUtils.isEmpty(pageData)){ + pd.put("PATH_ID", UuidUtil.get32UUID()); + }else { + map.put("result", "fail"); + map.put("msg", "名称已存在，请修改后重新提交"); + return map; + } + mkmjPathMapper.save(pd); + map.put("result", errInfo); + map.put("msg", "保存成功"); + return map; + } + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + mkmjPathMapper.delete(pd); + map.put("result", errInfo); + map.put("msg", "删除成功"); + return map; + } + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pageData = mkmjPathMapper.findByOnly(pd); + //查询不到重复数据 开始走业务 + if(!ObjectUtils.isEmpty(pageData)){ + map.put("result", "fail"); + map.put("msg", "名称已存在，请修改后重新提交"); + return map; + } + mkmjPathMapper.edit(pd); + map.put("result", errInfo); + map.put("msg", "编辑成功"); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return mkmjPathMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return mkmjPathMapper.listAll(pd); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List getPeopleInfolistPage(Page page)throws Exception{ + return mkmjPathMapper.getPeopleInfolistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List getCarInfolistPage(Page page)throws Exception{ + return mkmjPathMapper.getCarInfolistPage(page); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return mkmjPathMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public Object deleteAll(String[] ArrayDATA_IDS)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + mkmjPathMapper.deleteAll(ArrayDATA_IDS); + map.put("result", errInfo); + map.put("msg", "删除成功"); + return map; + } + + @Override + public Object savePosition(PageData pd) { + Map map = new HashMap(); + String errInfo = "success"; + mkmjPathMapper.savePosition(pd); + map.put("result", errInfo); + map.put("msg", "定位成功"); + return map; + } + /** + * 方法名称：地图的记录查询,主要是地图已经写好插件,准备把二级口门门禁的字段写入原来的系统中 + * 方法描述： + * 创建人：guoyuepeng + * 时间：2024/9/5 15:18 + * @param page + * @return java.util.List + */ + @Override + public List getPeopleInfolistPageByMap(Page page) throws Exception { + List peopleInfolistPage = mkmjPathMapper.getPeopleInfolistPage(page); + List valueList = new ArrayList<>(); + for (PageData pageData : peopleInfolistPage){ + PageData valueMap = new PageData(); + valueMap.put("CARDTYPE", pageData.getString("NAME")); + valueMap.put("USERNAME", pageData.getString("NAME")); + valueMap.put("acc_last_update_date", pageData.getString("TIME")); + valueMap.put("TIME", pageData.getString("TIME")); + valueMap.put("COMING_REASON", pageData.getString("BAYNAME")); + valueMap.put("EQUIPMENTNAME", pageData.getString("BAYNAME")); + if("出".equals(pageData.getString("STATUS"))){ + valueMap.put("STATE", "1"); + }else{ + valueMap.put("STATE", "0"); + } + valueList.add(valueMap); + } + return valueList; + } + + @Override + public List getCraInfolistPageByMap(Page page) throws Exception { + + List peopleInfolistPage = mkmjPathMapper.getCarInfolistPage(page); + List valueList = new ArrayList<>(); + for (PageData pageData : peopleInfolistPage){ + PageData valueMap = new PageData(); + valueMap.put("LICENSE_PLATE", pageData.getString("NAME")); + valueMap.put("TIME", pageData.getString("TIME")); + valueMap.put("COMING_REASON", pageData.getString("BAYNAME")); + if("出".equals(pageData.getString("STATUS"))){ + valueMap.put("STATE", "1"); + }else{ + valueMap.put("STATE", "0"); + } + valueList.add(valueMap); + } + return valueList; + } + +} + diff --git a/src/main/java/com/zcloud/service/door/impl/MkmjRelationServiceImpl.java b/src/main/java/com/zcloud/service/door/impl/MkmjRelationServiceImpl.java new file mode 100644 index 00000000..5a400c27 --- /dev/null +++ b/src/main/java/com/zcloud/service/door/impl/MkmjRelationServiceImpl.java @@ -0,0 +1,149 @@ +package com.zcloud.service.door.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.door.MkmjRelationMapper; +import com.zcloud.service.door.MkmjRelationService; +import com.zcloud.util.UuidUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：门口门禁区域闸机 + * 作者：zhaoyu + * 时间：2024-01-16 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class MkmjRelationServiceImpl implements MkmjRelationService { + + @Autowired + private MkmjRelationMapper mkmjRelationMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public Object save(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + pd.put("RELATION_ID", UuidUtil.get32UUID()); + mkmjRelationMapper.save(pd); + map.put("result", errInfo); + map.put("msg", "保存成功"); + return map; + } + + /**删除 + * @param pd + * @throws Exception + */ + public Object delete(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + mkmjRelationMapper.delete(pd); + map.put("result", errInfo); + map.put("msg", "删除成功"); + return map; + } + + /**修改 + * @param pd + * @throws Exception + */ + public Object edit(PageData pd)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + mkmjRelationMapper.edit(pd); + map.put("result", errInfo); + map.put("msg", "编辑成功"); + return map; + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return mkmjRelationMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return mkmjRelationMapper.listAll(pd); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllForArea(PageData pd)throws Exception{ + return mkmjRelationMapper.listAllForArea(pd); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List getAllCarAndPeopleInfoCountByArea(PageData pd)throws Exception{ + return mkmjRelationMapper.getAllCarAndPeopleInfoCountByArea(pd); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List getCarAndPeopleInfolistPage(Page page)throws Exception{ + return mkmjRelationMapper.getCarAndPeopleInfolistPage(page); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return mkmjRelationMapper.findById(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public Object deleteAll(String[] ArrayDATA_IDS)throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + mkmjRelationMapper.deleteAll(ArrayDATA_IDS); + map.put("result", errInfo); + map.put("msg", "删除成功"); + return map; + } + + @Override + public Object savePosition(PageData pd) { + Map map = new HashMap(); + String errInfo = "success"; + mkmjRelationMapper.savePosition(pd); + map.put("result", errInfo); + map.put("msg", "定位成功"); + return map; + } + @Override + public List findPersonRecord(PageData pageData){ + return mkmjRelationMapper.findPersonRecord(pageData); + } + @Override + public List findCarRecord(PageData pageData){ + return mkmjRelationMapper.findCarRecord(pageData); + } + +} + diff --git a/src/main/java/com/zcloud/service/door/impl/PlatformDoorVideoServiceImpl.java b/src/main/java/com/zcloud/service/door/impl/PlatformDoorVideoServiceImpl.java new file mode 100644 index 00000000..94466e07 --- /dev/null +++ b/src/main/java/com/zcloud/service/door/impl/PlatformDoorVideoServiceImpl.java @@ -0,0 +1,100 @@ +package com.zcloud.service.door.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.dsno2.door.PlatformDoorVideoMapper; +import com.zcloud.service.door.PlatformDoorVideoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：平台视频管理 + * 作者：luoxiaobao + * 时间：2023-07-21 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class PlatformDoorVideoServiceImpl implements PlatformDoorVideoService { + + @Autowired + private PlatformDoorVideoMapper platformDoorVideoMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + platformDoorVideoMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + platformDoorVideoMapper.delete(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + platformDoorVideoMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return platformDoorVideoMapper.datalistPage(page); + } + + /**列表 + * @param page + * @throws Exception + */ + public List listByPosition(Page page)throws Exception{ + return platformDoorVideoMapper.listByPositionlistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return platformDoorVideoMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return platformDoorVideoMapper.findById(pd); + } + + public PageData findByCode(PageData pd)throws Exception{ + return platformDoorVideoMapper.findByCode(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + platformDoorVideoMapper.deleteAll(ArrayDATA_IDS); + } + + @Override + public void delLocation(PageData pd) { + platformDoorVideoMapper.delLocation(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/map/impl/GateMachineServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/GateMachineServiceImpl.java index f864422c..f9dbef2b 100644 --- a/src/main/java/com/zcloud/service/map/impl/GateMachineServiceImpl.java +++ b/src/main/java/com/zcloud/service/map/impl/GateMachineServiceImpl.java @@ -5,9 +5,12 @@ import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.map.GateAreaMapper; import com.zcloud.mapper.datasource.map.GateMachineMapper; import com.zcloud.mapper.datasource.map.GateVideoMapper; +import com.zcloud.mapper.dsno2.door.MkmjDoorVideoMapper; +import com.zcloud.service.door.DoorAreaService; import com.zcloud.service.keyProjects.VideoManagerService; import com.zcloud.service.map.GateMachineService; import com.zcloud.util.InitPageDataUtil; +import com.zcloud.util.Tools; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,8 +37,10 @@ public class GateMachineServiceImpl implements GateMachineService { @Resource private InitPageDataUtil initPageDataUtil; - - + @Resource + private MkmjDoorVideoMapper mkmjDoorVideoMapper; + @Resource + private DoorAreaService doorAreaService; @Override public ArrayList getDatalistpage(Page page) { return gateMachineMapper.getDatalistPage(page); @@ -82,22 +87,41 @@ public class GateMachineServiceImpl implements GateMachineService { @Override public List getGatePosition(PageData pageData) { - // todo 需求变更，现在闸机变成了区域 - if (pageData.getString("TYPE").equals("PERSON")) { - pageData.put("GATE_AREA_TYPE", 0); - // 人闸机定位 - } - if (pageData.getString("TYPE").equals("CAR")) { - // 车闸机定位 - pageData.put("GATE_AREA_TYPE", 1); - } - if (pageData.getString("TYPE").equals("CAMERA")) { - // 摄像头定位 - return gateVideoMapper.getCameraPosition(pageData); - } + if (pageData.getString("CORPINFO_ID").equals("035958e685cf4850bc40151c5e0617a6")) { //一公司的口门门禁系统 + // todo 需求变更，现在闸机变成了区域 + if (pageData.getString("TYPE").equals("PERSON")) { + pageData.put("GATE_AREA_TYPE", 0); + // 人闸机定位 + } - return gateAreaMapper.getGatePosition(pageData); + if (pageData.getString("TYPE").equals("CAR")) { + // 车闸机定位 + pageData.put("GATE_AREA_TYPE", 1); + } + if (pageData.getString("TYPE").equals("CAMERA")) { + // 摄像头定位 + return gateVideoMapper.getCameraPosition(pageData); + } + + return gateAreaMapper.getGatePosition(pageData); + } else if (!Tools.isEmpty(pageData.getString("CORPINFO_ID"))) { //如果有企业信息,就是要显示二级口门门禁系统信息 + if (pageData.getString("TYPE").equals("CAMERA")) { + return mkmjDoorVideoMapper.listAll(pageData); + } + + if (pageData.getString("TYPE").equals("PERSON_MACHINE")) { + pageData.put("DOOR_TYPE", "0"); + // 人闸机定位 + } + + if (pageData.getString("TYPE").equals("CAR_MACHINE")) { + // 车闸机定位 + pageData.put("DOOR_TYPE", 1); + } + return doorAreaService.getAllByMap(pageData); + } + return null; } @Override diff --git a/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java b/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java index a313f873..0eebb398 100644 --- a/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java +++ b/src/main/java/com/zcloud/syncData/listener/SyncDataListener.java @@ -85,10 +85,12 @@ public class SyncDataListener implements RocketMQListener { pd.putAll(tenCorpDto.getPd()); pd.put("CONSUMPTION_TIME", DateUtil.date2Str(new Date())); pd.put("CONSUMPTION_TYPE","MqQyDataListener"); - if ("qy".equals(tenCorpDto.getMessage())){ - // 在本端发的同步消息，不需要再次同步该数据 - return; - } + //2024-10-08 黄宇轩修改， + // 三端新增用户后，人员中台将用户信息同步到core_sync_user表 +// if ("qy".equals(tenCorpDto.getMessage())){ +// // 在本端发的同步消息，不需要再次同步该数据 +// return; +// } try { //拿到原路径 String url = pd.getString("url"); diff --git a/src/main/java/com/zcloud/util/hk/HKPostApiUtil.java b/src/main/java/com/zcloud/util/hk/HKPostApiUtil.java new file mode 100644 index 00000000..69582eee --- /dev/null +++ b/src/main/java/com/zcloud/util/hk/HKPostApiUtil.java @@ -0,0 +1,268 @@ +package com.zcloud.util.hk; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.hikvision.artemis.sdk.Client; +import com.hikvision.artemis.sdk.Request; +import com.hikvision.artemis.sdk.Response; +import com.hikvision.artemis.sdk.constant.Constants; +import com.hikvision.artemis.sdk.enums.Method; +import com.zcloud.entity.PageData; +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author fangjiakai + * @date 2023/09/12 10:16 + */ +public class HKPostApiUtil { + /** + * 能力开放平台的网站路径 + * TODO 路径不用修改，就是/artemis + */ + private static final String ARTEMIS_PATH = "/artemis"; + + /** + * 通用海康接口 + * 调用POST请求类型(application/json)接口* + * + * @return + */ + public static Map publicHkInterface(String host, String appKey, String appSecret, JSONObject jsonBody, String url) { + final String getCamsApi = ARTEMIS_PATH + url; + Map path = new HashMap(2); + path.put("https://", getCamsApi); + // post请求application/json类型参数 + String result = doPostStringArtemis(host, appKey, appSecret, path, jsonBody.toJSONString(), null, null, "application/json", null); + JSONObject parseObject = JSONArray.parseObject(result); + return parseObject; + } + + /** + * 获取监控点预览取流URL + * + * @param id 设备编号 + * @return + */ + public static Map camerasPreviewURLs(String host, String appKey, String appSecret, String id, String type) { + JSONObject jsonBody = new JSONObject(); + jsonBody.put("cameraIndexCode", id); +// jsonBody.put("netZoneCode", "1"); + jsonBody.put("transmode", 1); + jsonBody.put("streamType", 0); + jsonBody.put("protocol", type); +// jsonBody.put("expireTime", -1); + jsonBody.put("expand", "transcode=1&streamform=rtp"); + Map returnMap = publicHkInterface(host, appKey, appSecret, jsonBody, "/api/video/v2/cameras/previewURLs"); + return returnMap; + } + + /** + * 获取所有区域数 + * + * @return + */ + public static Map getAllArea(String host, String appKey, String appSecret) { + JSONObject jsonBody = new JSONObject(); + jsonBody.put("parentIndexCode", "root000000"); + jsonBody.put("resourceType", "camera"); + jsonBody.put("pageNo", 1); + jsonBody.put("pageSize", 100); + jsonBody.put("cascadeFlag", 0); + Map returnMap = publicHkInterface(host, appKey, appSecret, jsonBody, "/api/resource/v2/regions/subRegions"); + return returnMap; + } + + /** + * 获取区域内摄像头数 + * + * @return + */ + public static Map getAreaCamera(String host, String appKey, String appSecret, String indexCode) { + JSONObject jsonBody = new JSONObject(); + jsonBody.put("regionIndexCode", indexCode); + jsonBody.put("resourceType", "camera"); + jsonBody.put("pageNo", 1); + jsonBody.put("pageSize", 100); + Map returnMap = publicHkInterface(host, appKey, appSecret, jsonBody, "/api/irds/v2/resource/subResources"); + return returnMap; + } + + /** + * API名称： + * 查询监控点列表v2 + * 分组： + * 视频资源接口 + * 提供方名称： + * 资源目录服务 + * qps： + * 描述：根据条件查询目录下有权限的监控点列表 + * + * @return + */ + public static Map cameraSearch(String host, String appKey, String appSecret, PageData pd) { + JSONObject jsonBody = new JSONObject(); + jsonBody.put("pageNo", pd.get("pageNo")); + jsonBody.put("pageSize", pd.get("pageSize")); + if (pd.get("name") != null && !"".equals(pd.getString("name"))) + jsonBody.put("name", pd.get("name")); + jsonBody.put("orderBy", "name"); + jsonBody.put("orderType", "desc"); + jsonBody.put("resourceType", "camera"); + Map returnMap = publicHkInterface(host, appKey, appSecret, jsonBody, "/api/resource/v2/camera/search"); + return returnMap; + } + + /** + * 订阅事件 + * + * @param ids 事件编号 131588 + * @return + */ + public static Map subscribeEvent(String host, String appKey, String appSecret, String[] ids) { + JSONObject jsonBody = new JSONObject(); + jsonBody.put("eventTypes", ids); + jsonBody.put("eventDest", "1"); + Map returnMap = publicHkInterface(host, appKey, appSecret, jsonBody, "/api/eventService/v1/eventSubscriptionByEventTypes"); + return returnMap; + } + + /** + * API名称： + * 闸机信息获取v2 + * + * @return + */ + public static Map getCarDoorList(String host, String appKey, String appSecret, PageData pd) { + JSONObject jsonBody = new JSONObject(); + Map returnMap = publicHkInterface(host, appKey, appSecret, jsonBody, "/api/resource/v1/park/parkList"); + return returnMap; + } + + /** + * API名称： + * 闸机信息获取v2 + * + * @return + */ + public static Map getCarDoorInfo(String host, String appKey, String appSecret, String parkIndexCodes) { + JSONObject jsonBody = new JSONObject(); + jsonBody.put("parkIndexCodes", parkIndexCodes); + Map returnMap = publicHkInterface(host, appKey, appSecret, jsonBody, "/api/resource/v1/entrance/entranceList"); + return returnMap; + } + + public static Map getCarPathByDoor(String host, String appKey, String appSecret,String parkIndexCodes){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("parkIndexCodes",parkIndexCodes); + Map returnMap = publicHkInterface(host, appKey, appSecret, jsonBody,"/api/resource/v1/entrance/entranceList"); + return returnMap; + } + + public static Map getCarDevice(String host, String appKey, String appSecret,String entranceIndexCodes){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("entranceIndexCodes",entranceIndexCodes); + Map returnMap = publicHkInterface(host, appKey, appSecret, jsonBody,"/api/resource/v1/roadway/roadwayList"); + return returnMap; + } + + /** + * API名称： + * 查询门禁设备列表v2 + * @return + */ + public static Map acsDeviceSearch(String host, String appKey, String appSecret,PageData pd){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("pageNo", pd.get("pageNo")); + jsonBody.put("pageSize", pd.get("pageSize")); + if(pd.get("name")!=null && !"".equals(pd.getString("name"))) + jsonBody.put("name", pd.get("name")); + jsonBody.put("orderBy", "name"); + jsonBody.put("orderType", "desc"); + Map returnMap=publicHkInterface(host, appKey, appSecret,jsonBody,"/api/resource/v2/acsDevice/search"); + return returnMap; + } + + /** + * API名称： + * 闸机信息获取v2 + * @return + */ + public static Map getGateMachineInfo(String host, String appKey, String appSecret, PageData pd){ + JSONObject jsonBody = new JSONObject(); + jsonBody.put("pageNo", pd.get("pageNo")); + jsonBody.put("pageSize", pd.get("pageSize")); + Map returnMap = publicHkInterface(host, appKey, appSecret, jsonBody,"/api/resource/v2/door/search"); + return returnMap; + } + public static String doPostStringArtemis(String host, String appKey, String appSecret, Map path, String body, Map querys, String accept, String contentType, Map header) { + String httpSchema = (String) path.keySet().toArray()[0]; + if (httpSchema != null && !StringUtils.isEmpty(httpSchema)) { + String responseStr = null; + + try { + Map headers = new HashMap(); + if (StringUtils.isNotBlank(accept)) { + headers.put("Accept", accept); + } else { + headers.put("Accept", "*/*"); + } + + if (StringUtils.isNotBlank(contentType)) { + headers.put("Content-Type", contentType); + } else { + headers.put("Content-Type", "application/text;charset=UTF-8"); + } + + if (header != null) { + headers.putAll(header); + } + + Request request = new Request(Method.POST_STRING, httpSchema + host, (String) path.get(httpSchema), appKey, appSecret, Constants.DEFAULT_TIMEOUT); + request.setHeaders(headers); + request.setQuerys(querys); + request.setStringBody(body); + Response response = Client.execute(request); + responseStr = getResponseResult(response); + } catch (Exception var11) { + var11.printStackTrace(); + } + return responseStr; + } else { + throw new RuntimeException("http和https参数错误httpSchema: " + httpSchema); + } + } + + private static String getResponseResult(Response response) { + String responseStr = null; + int statusCode = response.getStatusCode(); + if (!String.valueOf(statusCode).startsWith("2") && !String.valueOf(statusCode).startsWith("3")) { + String msg = response.getErrorMessage(); + responseStr = response.getBody(); + System.out.println("the Artemis Request is Failed,statusCode:" + statusCode + " errorMsg:" + msg); + } else { + responseStr = response.getBody(); + System.out.println("the Artemis Request is Success,statusCode:" + statusCode + " SuccessMsg:" + response.getBody()); + } + + return responseStr; + } + + public static void main(String[] args) { + String door_host = "192.168.164.50:443"; + String door_appKey = "24307012"; + String door_appSecret = "SLsUPf6WVR4uzu8NPdqq"; + JSONObject jsonBody = new JSONObject(); + jsonBody.put("pageNo", 1); + jsonBody.put("pageSize", 10); +// jsonBody.put("orderBy", "name"); +// jsonBody.put("orderType", "desc"); +// jsonBody.put("resourceType", "region"); +// jsonBody.put("parkIndexCodes","34849cb85867447cbd2f0682aac4379a"); + Map returnMap = publicHkInterface(door_host, door_appKey, door_appSecret, jsonBody, "/api/resource/v2/door/search"); + System.out.println(returnMap); + } + +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 0af30d47..1c079768 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -58,14 +58,14 @@ spring.main.banner-mode=off #preventionxgf.api.url=http://127.0.0.1:8088/ # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 -preventionxgf.api.url=http://39.100.115.58:8082/qa-prevention-xgf/ -qa-regulatory-gwj.api.url=http://39.100.115.58:8081/qa-regulatory-gwj/ +preventionxgf.api.url=https://qggf.qhdsafety.com/xgfApi/ +qa-regulatory-gwj.api.url=https://qggf.qhdsafety.com/jgApi/ dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/ #????? -smb.host=39.101.130.96 +smb.host=172.24.151.13 smb.port=22 smb.user=root -smb.password=Zcloud@zcloud88888 +smb.password=0#MGi=dgtbU$r26_ smb.basePath=/mnt/wwag/file/ #Mq\u914D\u7F6E @@ -106,7 +106,6 @@ perLoc.url=http://192.168.210.32:8084 perLoc.userName=qaaqadmin perLoc.pwd=Cfd2023@ baseimgpath =http://192.168.192.201:8991/file/ -tongbu.url=http://127.0.0.1:8094 mq.csy.data.topic=csy_docking mq.csy.data.group=scheduled_tasks_csy_docking @@ -145,6 +144,7 @@ gongJiangXueYuanProdUrl=https://gjxy.bjttsx.com gongJiangXueYuanGetImgUrl=https://wwag.qhdsafety.com/file/ # \u4E2D\u53F0 +tongbu.url=http://127.0.0.1:8094 # \u6D88\u8D39\u4E2D\u53F0\u901A\u77E5 mq.consumer.dataChange.tongbu-data-change.topic=tongbu_dataChange_docking mq.consumer.dataChange.tongbu-data-change.group=tongbu_dataChange_group diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 1b0a68d3..cc3d91d4 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -391,46 +391,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update - set - - NAME = #{NAME} - - - ,DEPARTMENT_ID = #{DEPARTMENT_ID} - - - ,POST_ID = #{POST_ID} - - - ,ROLE_ID = #{ROLE_ID} - - - ,ROLE_IDS = #{ROLE_IDS} - - - ,BZ = #{BZ} - - - ,EMAIL = #{EMAIL} - - - ,NUMBER = #{NUMBER} - - - ,SORT = #{SORT} - - - ,PERSON_TYPE = #{PERSON_TYPE} - - - ,IS_HAZARDCONFIRMER = #{IS_HAZARDCONFIRMER} - - - ,IS_ONLINELEARNING = #{IS_ONLINELEARNING} - - - ,PHONE = #{PHONE} - + set NAME = #{NAME}, + DEPARTMENT_ID = #{DEPARTMENT_ID}, + POST_ID =#{POST_ID}, + ROLE_ID = #{ROLE_ID}, + ROLE_IDS = #{ROLE_IDS}, + BZ = #{BZ}, + EMAIL = #{EMAIL}, + NUMBER = #{NUMBER}, + SORT = #{SORT}, + PERSON_TYPE = #{PERSON_TYPE}, + IS_HAZARDCONFIRMER = #{IS_HAZARDCONFIRMER}, + IS_ONLINELEARNING = #{IS_ONLINELEARNING}, + PHONE = #{PHONE} ,ISPUSH = #{ISPUSH} @@ -661,10 +634,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (u.ISPUSH = "1" or u.ISMAIN = "1") and u.ISDELETE = '0' + + AND u.ISDELETE = '0' + + AND @@ -797,9 +775,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select + + from + f + where + f.AREA_ID=#{AREA_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + AREA_ID in + + #{item} + + + + + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/door/MkmjDeviceMapper.xml b/src/main/resources/mybatis/dsno2/door/MkmjDeviceMapper.xml new file mode 100644 index 00000000..a0045045 --- /dev/null +++ b/src/main/resources/mybatis/dsno2/door/MkmjDeviceMapper.xml @@ -0,0 +1,217 @@ + + + + + + + MKMJ_DEVICE + + + + + SYS_DICTIONARIES + + + + + f.DEVICE_ID, + f.DOCK_DEVICE_ID, + f.DOOR_ID, + f.PATH_ID, + f.DEVICE_NAME, + f.DEVICE_TYPE, + f.STATUS, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + DEVICE_ID, + DOCK_DEVICE_ID, + DOOR_ID, + PATH_ID, + DEVICE_NAME, + DEVICE_TYPE, + STATUS, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{DEVICE_ID}, + #{DOCK_DEVICE_ID}, + #{DOOR_ID}, + #{PATH_ID}, + #{DEVICE_NAME}, + #{DEVICE_TYPE}, + #{STATUS}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + DEVICE_ID = #{DEVICE_ID} + + + + + update + + set + DOCK_DEVICE_ID = #{DOCK_DEVICE_ID}, + DOOR_ID = #{DOOR_ID}, + PATH_ID = #{PATH_ID}, + DEVICE_NAME = #{DEVICE_NAME}, + DEVICE_TYPE = #{DEVICE_TYPE}, + STATUS = #{STATUS}, + CORPINFO_ID = #{CORPINFO_ID}, + CREATOR = #{CREATOR}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + ISDELETE = #{ISDELETE} + where + DEVICE_ID=#{DEVICE_ID} + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + DEVICE_ID in + + #{item} + + + + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + DEVICE_ID = #{DEVICE_ID} + + diff --git a/src/main/resources/mybatis/dsno2/door/MkmjDoorVideoMapper.xml b/src/main/resources/mybatis/dsno2/door/MkmjDoorVideoMapper.xml new file mode 100644 index 00000000..3524087c --- /dev/null +++ b/src/main/resources/mybatis/dsno2/door/MkmjDoorVideoMapper.xml @@ -0,0 +1,202 @@ + + + + + + + MKMJ_DOOR_VIDEO + + + + + SYS_DICTIONARIES + + + + + f.DOOR_VIDEO_ID, + f.DOOR_ID, + f.PLATFORMVIDEOMANAGEMENT_ID, + f.LONGITUDE, + f.LATITUDE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + DOOR_VIDEO_ID, + DOOR_ID, + PLATFORMVIDEOMANAGEMENT_ID, + LONGITUDE, + LATITUDE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{DOOR_VIDEO_ID}, + #{DOOR_ID}, + #{PLATFORMVIDEOMANAGEMENT_ID}, + #{LONGITUDE}, + #{LATITUDE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + DOOR_VIDEO_ID = #{DOOR_VIDEO_ID} + + + + + update + + set + DOOR_VIDEO_ID= DOOR_VIDEO_ID, + DOOR_ID=#{DOOR_ID}, + PLATFORMVIDEOMANAGEMENT_ID=#{PLATFORMVIDEOMANAGEMENT_ID}, + LONGITUDE=#{LONGITUDE}, + LATITUDE=#{LATITUDE}, + CORPINFO_ID=#{CORPINFO_ID}, + CREATOR=#{CREATOR}, + CREATTIME=#{CREATTIME}, + OPERATOR=#{OPERATOR}, + OPERATTIME=#{OPERATTIME}, + ISDELETE=#{ISDELETE} + where + DOOR_VIDEO_ID=#{DOOR_VIDEO_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + DOOR_VIDEO_ID in + + #{item} + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + DOOR_VIDEO_ID = #{DOOR_VIDEO_ID} + + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/door/MkmjPathMapper.xml b/src/main/resources/mybatis/dsno2/door/MkmjPathMapper.xml new file mode 100644 index 00000000..3c451a42 --- /dev/null +++ b/src/main/resources/mybatis/dsno2/door/MkmjPathMapper.xml @@ -0,0 +1,244 @@ + + + + + + + MKMJ_PATH + + + + + SYS_DICTIONARIES + + + + + f.PATH_ID, + f.DOOR_ID, + f.PATH_NAME, + f.PATH_TYPE, + f.STATUS, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + PATH_ID, + DOOR_ID, + PATH_NAME, + PATH_TYPE, + STATUS, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{PATH_ID}, + #{DOOR_ID}, + #{PATH_NAME}, + #{PATH_TYPE}, + #{STATUS}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + PATH_ID = #{PATH_ID} + + + + + update + + set + DOOR_ID = #{DOOR_ID}, + PATH_NAME = #{PATH_NAME}, + PATH_TYPE = #{PATH_TYPE}, + STATUS = #{STATUS}, + CORPINFO_ID = #{CORPINFO_ID}, + CREATOR = #{CREATOR}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + ISDELETE = #{ISDELETE} + where + PATH_ID=#{PATH_ID} + + + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + PATH_ID in + + #{item} + + + + + + + + + update + + set + LATITUDE = #{LATITUDE}, + LONGITUDE = #{LONGITUDE} + where + PATH_ID = #{PATH_ID} + + diff --git a/src/main/resources/mybatis/dsno2/door/MkmjRelationMapper.xml b/src/main/resources/mybatis/dsno2/door/MkmjRelationMapper.xml new file mode 100644 index 00000000..bfe7984f --- /dev/null +++ b/src/main/resources/mybatis/dsno2/door/MkmjRelationMapper.xml @@ -0,0 +1,325 @@ + + + + + + + MKMJ_RELATION + + + + + SYS_DICTIONARIES + + + + + f.RELATION_ID, + f.AREA_ID, + f.DEVICE_ID, + f.TYPE, + f.CORPINFO_ID, + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE + + + + + RELATION_ID, + AREA_ID, + DEVICE_ID, + TYPE, + CORPINFO_ID, + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE + + + + + #{RELATION_ID}, + #{AREA_ID}, + #{DEVICE_ID}, + #{TYPE}, + #{CORPINFO_ID}, + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + RELATION_ID = #{RELATION_ID} + + + + + update + + set + RELATION_ID = RELATION_ID, + AREA_ID = #{AREA_ID}, + DEVICE_ID = #{DEVICE_ID}, + TYPE = #{TYPE}, + CORPINFO_ID = #{CORPINFO_ID}, + CREATOR = #{CREATOR}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + ISDELETE = #{ISDELETE} + where + RELATION_ID=#{RELATION_ID} + + + + + + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + DEVICE_ID in + + #{item} + + + + + + + + diff --git a/src/main/resources/mybatis/dsno2/door/PlatformDoorVideoMapper.xml b/src/main/resources/mybatis/dsno2/door/PlatformDoorVideoMapper.xml new file mode 100644 index 00000000..24868a8d --- /dev/null +++ b/src/main/resources/mybatis/dsno2/door/PlatformDoorVideoMapper.xml @@ -0,0 +1,236 @@ + + + + + + + BUS_PLATFORM_DOOR_VIDEO + + + + + SYS_DICTIONARIES + + + + + f.CORPINFO_ID, + f.INDEXCODE, + f.REGIONINDEXCODE, + f.EXTERNALINDEXCODE, + f.NAME, + f.LONGITUDE, + f.LATITUDE, + f.CAMERATYPE, + f.CASCADECODE, + f.DECODETAG, + f.RESOURCETYPE, + f.CREATETIME, + f.UPDATETIME, + f.SORT, + f.DISORDER, + f.RECORDLOCATION, + f.CASCADETYPE, + f.REGIONNAME, + f.REGIONPATH, + f.REGIONPATHNAME, + f.PLATFORMDOORVIDEO_ID + + + + + CORPINFO_ID, + INDEXCODE, + REGIONINDEXCODE, + EXTERNALINDEXCODE, + NAME, + LONGITUDE, + LATITUDE, + CAMERATYPE, + CASCADECODE, + DECODETAG, + RESOURCETYPE, + CREATETIME, + UPDATETIME, + SORT, + DISORDER, + RECORDLOCATION, + CASCADETYPE, + REGIONNAME, + REGIONPATH, + REGIONPATHNAME, + PLATFORMDOORVIDEO_ID + + + + + #{CORPINFO_ID}, + #{INDEXCODE}, + #{REGIONINDEXCODE}, + #{EXTERNALINDEXCODE}, + #{NAME}, + #{LONGITUDE}, + #{LATITUDE}, + #{CAMERATYPE}, + #{CASCADECODE}, + #{DECODETAG}, + #{RESOURCETYPE}, + #{CREATETIME}, + #{UPDATETIME}, + #{SORT}, + #{DISORDER}, + #{RECORDLOCATION}, + #{CASCADETYPE}, + #{REGIONNAME}, + #{REGIONPATH}, + #{REGIONPATHNAME}, + #{PLATFORMDOORVIDEO_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + PLATFORMDOORVIDEO_ID = #{PLATFORMDOORVIDEO_ID} + + + + + update + + set + CORPINFO_ID = #{CORPINFO_ID}, + INDEXCODE = #{INDEXCODE}, + REGIONINDEXCODE = #{REGIONINDEXCODE}, + EXTERNALINDEXCODE = #{EXTERNALINDEXCODE}, + NAME = #{NAME}, + LONGITUDE = #{LONGITUDE}, + LATITUDE = #{LATITUDE}, + CAMERATYPE = #{CAMERATYPE}, + CASCADECODE = #{CASCADECODE}, + DECODETAG = #{DECODETAG}, + RESOURCETYPE = #{RESOURCETYPE}, + CREATETIME = #{CREATETIME}, + UPDATETIME = #{UPDATETIME}, + SORT = #{SORT}, + DISORDER = #{DISORDER}, + RECORDLOCATION = #{RECORDLOCATION}, + CASCADETYPE = #{CASCADETYPE}, + REGIONNAME = #{REGIONNAME}, + REGIONPATH = #{REGIONPATH}, + REGIONPATHNAME = #{REGIONPATHNAME}, + PLATFORMDOORVIDEO_ID = PLATFORMDOORVIDEO_ID + where + PLATFORMDOORVIDEO_ID = #{PLATFORMDOORVIDEO_ID} + + + + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + PLATFORMDOORVIDEO_ID in + + #{item} + + + + + + + update + + set + LONGITUDE = null, + LATITUDE = null, + CORPINFO_ID = null + where + PLATFORMDOORVIDEO_ID = #{PLATFORMDOORVIDEO_ID} + +