From 2311b8333af15dc390f4a0ac2507e5f14a333903 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Fri, 15 Mar 2024 17:52:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=AE=89=E5=85=A8=E4=BA=8B?= =?UTF-8?q?=E6=95=85=E6=A1=A3=E6=A1=88=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrafficSafetyAssessmentController.java | 20 + .../TrafficSafetyProductionController.java | 20 + ...curityAccidentInvestigationController.java | 180 +++++++++ ...SecurityManagementAgreementController.java | 181 +++++++++ ...cSecurityManagementStaffingController.java | 20 + ...curityViolationRegistrationController.java | 163 ++++++++ .../TrafficSafetyAssessmentMapper.java | 2 + .../TrafficSafetyProductionMapper.java | 2 + ...icSecurityAccidentInvestigationMapper.java | 19 + ...fficSecurityManagementAgreementMapper.java | 20 + ...afficSecurityManagementStaffingMapper.java | 2 + ...icSecurityViolationRegistrationMapper.java | 20 + .../TrafficSafetyAssessmentService.java | 2 + .../TrafficSafetyProductionService.java | 2 + ...cSecurityAccidentInvestigationService.java | 18 + ...ficSecurityManagementAgreementService.java | 18 + ...fficSecurityManagementStaffingService.java | 2 + ...cSecurityViolationRegistrationService.java | 19 + .../TrafficSafetyAssessmentServiceImpl.java | 5 + .../TrafficSafetyProductionServiceImpl.java | 5 + ...urityAccidentInvestigationServiceImpl.java | 41 ++ .../TrafficSecurityCommitmentServiceImpl.java | 5 +- .../TrafficSecurityEmployeesDetailsImpl.java | 5 +- ...ecurityManagementAgreementServiceImpl.java | 40 ++ ...SecurityManagementStaffingServiceImpl.java | 5 + ...urityViolationRegistrationServiceImpl.java | 40 ++ .../TrafficSafetyAssessmentMapper.xml | 12 + .../TrafficSafetyProductionMapper.xml | 12 + ...ficSecurityAccidentInvestigationMapper.xml | 359 ++++++++++++++++++ ...afficSecurityManagementAgreementMapper.xml | 146 +++++++ ...rafficSecurityManagementStaffingMapper.xml | 12 + ...ficSecurityViolationRegistrationMapper.xml | 158 ++++++++ .../mybatis/datasource/system/UsersMapper.xml | 1 + 33 files changed, 1552 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSecurityAccidentInvestigationService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementAgreementService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSecurityViolationRegistrationService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityAccidentInvestigationServiceImpl.java rename src/main/java/com/zcloud/service/comprehensive/{ => impl}/TrafficSecurityCommitmentServiceImpl.java (88%) rename src/main/java/com/zcloud/service/comprehensive/{ => impl}/TrafficSecurityEmployeesDetailsImpl.java (80%) create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityViolationRegistrationServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.xml diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java index 2171757..b735991 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyAssessmentController.java @@ -157,4 +157,24 @@ public class TrafficSafetyAssessmentController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 删除 + * @return + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + safetyAssessmentService.delete(pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java index 90fefc9..19a1079 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyProductionController.java @@ -156,4 +156,24 @@ public class TrafficSafetyProductionController extends BaseController { map.put("result", errInfo); return map; } + + /** + * 删除 + * @return + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + safetyProductionService.delete(pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java new file mode 100644 index 0000000..eb1e575 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityAccidentInvestigationController.java @@ -0,0 +1,180 @@ +package com.zcloud.controller.comprehensive; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.comprehensive.TrafficSecurityAccidentInvestigationService; +import com.zcloud.service.comprehensive.TrafficSecurityViolationRegistrationService; +import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; +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.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/accidentinvestigation") +public class TrafficSecurityAccidentInvestigationController extends BaseController { + @Autowired + private TrafficSecurityAccidentInvestigationService accidentInvestigationService; + @Autowired + private Smb smb; + + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestParam(value="FFILEONE",required=false) MultipartFile fileOne, + @RequestParam(value="FFILETWO",required=false) MultipartFile fileTwo) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + String accidentinvestigation_id = this.get32UUID(); + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("ACCIDENTINVESTIGATION_ID", accidentinvestigation_id); // 主键 + pd.put("INCIDENTNUMBER", this.get32UUID()); // 事故编号 + pd.put("CERTIFICATIONNUMBER", this.get32UUID()); // 认定书编号 + pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("DEPARTMENT", Jurisdiction.getCORPINFO_ID()); // 部门 + pd.put("ISDELETE", "0"); + + String ffile = DateUtil.getDays(); + if (fileOne != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ + String suffixName = fileOne.getOriginalFilename().substring(fileOne.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + fileOne.getOriginalFilename().substring(fileOne.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(fileOne, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); + pd.put("ACCIDENTREPORTRECORD", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + if (fileTwo != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ + String suffixName = fileTwo.getOriginalFilename().substring(fileTwo.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + fileTwo.getOriginalFilename().substring(fileTwo.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(fileTwo, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); + pd.put("ACCIDENTANALYSISRECORD", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + accidentInvestigationService.save(pd); + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + //列表 + @RequestMapping(value = "/listForAccidentInvestigation") + @ResponseBody + public Object listForAccidentInvestigation(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + String USER_ID = pd.getString("USER_ID"); + if (Tools.notEmpty(USER_ID)) + pd.put("USER_ID", USER_ID.trim()); + + String ACCIDENTDATE = pd.getString("ACCIDENTDATE"); // 运输车辆 + if (Tools.notEmpty(ACCIDENTDATE)) + pd.put("ACCIDENTDATE", ACCIDENTDATE.trim()); + + page.setPd(pd); + List varList = accidentInvestigationService.listForAccidentInvestigation(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + accidentInvestigationService.delete(pd); + map.put("result", errInfo); + return map; + } + + /** + * 查看详情 + * @return + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd = accidentInvestigationService.findById(pd); // 根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + //修改 + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + + String ffile = DateUtil.getDays(); + if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){ + pd.put("COMPLETIONSTATUS", "1"); + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + accidentInvestigationService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java new file mode 100644 index 0000000..8791b34 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementAgreementController.java @@ -0,0 +1,181 @@ +package com.zcloud.controller.comprehensive; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.comprehensive.TrafficSecurityManagementAgreementService; +import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; +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.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/managementagreement") +public class TrafficSecurityManagementAgreementController extends BaseController { + @Autowired + private TrafficSecurityManagementAgreementService managementAgreementService; + @Autowired + private Smb smb; + + //新增 + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + String managementagreementId = this.get32UUID(); + + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("MANAGEMENTAGREEMENT_ID", managementagreementId); // 主键 + pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("COMPLETIONSTATUS", "0"); + pd.put("ISDELETE", "0"); + + if (DateUtil.compareDate(DateUtil.getDay(), pd.getString("EXPIRYDATE"))) { + pd.put("VALIDSTATUS", "0"); + } else { + pd.put("VALIDSTATUS", "1"); + } + String ffile = DateUtil.getDays(); + + if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ + pd.put("COMPLETIONSTATUS", "1"); + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + managementAgreementService.save(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + //修改 + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("ISDELETE", "0"); + String ffile = DateUtil.getDays(); + + if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){ + pd.put("COMPLETIONSTATUS", "1"); + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + managementAgreementService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + /** + * 列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value = "/listForManagementAgreementlist") + @ResponseBody + public Object listForManagementAgreementlist(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + String SYSTEMNAME = pd.getString("SYSTEMNAME"); // 关键词检索条件 + if (Tools.notEmpty(SYSTEMNAME)) + pd.put("SYSTEMNAME", SYSTEMNAME.trim()); + + String COMPLETIONSTATUS = pd.getString("COMPLETIONSTATUS"); // 关键词检索条件 + if (Tools.notEmpty(COMPLETIONSTATUS)) + pd.put("COMPLETIONSTATUS", COMPLETIONSTATUS.trim()); + + String VALIDSTATUS = pd.getString("VALIDSTATUS"); // 关键词检索条件 + if (Tools.notEmpty(VALIDSTATUS)) + pd.put("VALIDSTATUS", VALIDSTATUS.trim()); + + page.setPd(pd); + List varList = managementAgreementService.listForManagementAgreementlist(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + //详情 + @RequestMapping(value="/goEdit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = managementAgreementService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /** + * 删除 + * @return + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + managementAgreementService.delete(pd); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java index 14ebf7b..60a3a52 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityManagementStaffingController.java @@ -160,4 +160,24 @@ public class TrafficSecurityManagementStaffingController extends BaseController map.put("result", errInfo); return map; } + + /** + * 删除 + * @return + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + securityManagementStaffingService.delete(pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java new file mode 100644 index 0000000..6ed198a --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityViolationRegistrationController.java @@ -0,0 +1,163 @@ +package com.zcloud.controller.comprehensive; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.service.comprehensive.TrafficSecurityViolationRegistrationService; +import com.zcloud.util.*; +import org.apache.commons.lang.StringUtils; +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.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/violationregistration") +public class TrafficSecurityViolationRegistrationController extends BaseController { + @Autowired + private TrafficSecurityViolationRegistrationService violationRegistrationService; + @Autowired + private Smb smb; + + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + String registration_id = this.get32UUID(); + + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("REGISTRATION_ID", registration_id); // 主键 + pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 + pd.put("ISDELETE", "0"); + + String ffile = DateUtil.getDays(); + if (file != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))){ + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("TRANSPORTATIONCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + violationRegistrationService.save(pd); + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + //列表 + @RequestMapping(value = "/listForViolationRegistration") + @ResponseBody + public Object listForViolationRegistration(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + String USER_ID = pd.getString("USER_ID"); // 运输企业 + if (Tools.notEmpty(USER_ID)) + pd.put("USER_ID", USER_ID.trim()); + + String PENALTYTIME = pd.getString("PENALTYTIME"); // 运输车辆 + if (Tools.notEmpty(PENALTYTIME)) + pd.put("PENALTYTIME", PENALTYTIME.trim()); + + page.setPd(pd); + List varList = violationRegistrationService.listForViolationRegistration(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + @ResponseBody + public Object delete() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + violationRegistrationService.delete(pd); + map.put("result", errInfo); + return map; + } + + /** + * 查看详情 + * @return + * @throws Exception + */ + @RequestMapping(value="/goEdit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd = violationRegistrationService.findById(pd); // 根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + //修改 + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + pd.put("OPERATOR", Jurisdiction.getUSER_ID()); // 修改人id + pd.put("OPERATORNAME", Jurisdiction.getName()); // 修改人姓名 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); // 修改时间 + + String ffile = DateUtil.getDays(); + if (file != null && StringUtils.isNotBlank(pd.getString("OPERATORNAME"))){ + pd.put("COMPLETIONSTATUS", "1"); + String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "文件格式不正确！"); + return map; + } + String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("OPERATINGCOMPANY") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); + pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); + } + + violationRegistrationService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyAssessmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyAssessmentMapper.java index de71b99..c428b10 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyAssessmentMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyAssessmentMapper.java @@ -15,4 +15,6 @@ public interface TrafficSafetyAssessmentMapper { void edit(PageData pd); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java index 6865a11..32919df 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyProductionMapper.java @@ -15,4 +15,6 @@ public interface TrafficSafetyProductionMapper { void edit(PageData pd); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.java new file mode 100644 index 0000000..cefd1a8 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.java @@ -0,0 +1,19 @@ +package com.zcloud.mapper.datasource.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +@Mapper +public interface TrafficSecurityAccidentInvestigationMapper { + void save(PageData pd); + + List datalistPage(Page page); + + void edit(PageData pd); + + PageData findById(PageData pd); + + void delete(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.java new file mode 100644 index 0000000..4d51069 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.java @@ -0,0 +1,20 @@ +package com.zcloud.mapper.datasource.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TrafficSecurityManagementAgreementMapper { + void save(PageData pd); + + List datalistPage(Page page); + + void edit(PageData pd); + + PageData findById(PageData pd); + + void delete(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java index ebe514e..1c978e9 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.java @@ -15,4 +15,6 @@ public interface TrafficSecurityManagementStaffingMapper { void edit(PageData pd); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.java new file mode 100644 index 0000000..f9f1506 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityViolationRegistrationMapper.java @@ -0,0 +1,20 @@ +package com.zcloud.mapper.datasource.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TrafficSecurityViolationRegistrationMapper { + void save(PageData pd); + + List datalistPage(Page page); + + void edit(PageData pd); + + PageData findById(PageData pd); + + void delete(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyAssessmentService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyAssessmentService.java index 33fafee..627e91b 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyAssessmentService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyAssessmentService.java @@ -13,4 +13,6 @@ public interface TrafficSafetyAssessmentService { List listForSafetyAssessment(Page page); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java index 3b0a8fa..3b7e990 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyProductionService.java @@ -13,4 +13,6 @@ public interface TrafficSafetyProductionService { List listForSafetyProductionlist(Page page); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityAccidentInvestigationService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityAccidentInvestigationService.java new file mode 100644 index 0000000..c9a539b --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityAccidentInvestigationService.java @@ -0,0 +1,18 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSecurityAccidentInvestigationService { + void save(PageData pd); + + List listForAccidentInvestigation(Page page); + + void delete(PageData pd); + + PageData findById(PageData pd); + + void edit(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementAgreementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementAgreementService.java new file mode 100644 index 0000000..e6ae118 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementAgreementService.java @@ -0,0 +1,18 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSecurityManagementAgreementService { + void save(PageData pd); + + void edit(PageData pd); + + List listForManagementAgreementlist(Page page); + + PageData findById(PageData pd); + + void delete(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java index 7bfd1c5..66eb67a 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityManagementStaffingService.java @@ -13,4 +13,6 @@ public interface TrafficSecurityManagementStaffingService { void edit(PageData pd); PageData findById(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityViolationRegistrationService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityViolationRegistrationService.java new file mode 100644 index 0000000..ea802c2 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityViolationRegistrationService.java @@ -0,0 +1,19 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSecurityViolationRegistrationService { + void save(PageData pd); + + List listForViolationRegistration(Page page); + + void delete(PageData pd); + + PageData findById(PageData pd); + + void edit(PageData pd); + +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyAssessmentServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyAssessmentServiceImpl.java index 012201a..f64e91c 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyAssessmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyAssessmentServiceImpl.java @@ -33,4 +33,9 @@ public class TrafficSafetyAssessmentServiceImpl implements TrafficSafetyAssessme public PageData findById(PageData pd) { return safetyAssessmentMapper.findById(pd); } + + @Override + public void delete(PageData pd) { + safetyAssessmentMapper.delete(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java index 80426ad..246a309 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyProductionServiceImpl.java @@ -32,4 +32,9 @@ public class TrafficSafetyProductionServiceImpl implements TrafficSafetyProducti public PageData findById(PageData pd) { return speedProductionMapper.findById(pd); } + + @Override + public void delete(PageData pd) { + speedProductionMapper.delete(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityAccidentInvestigationServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityAccidentInvestigationServiceImpl.java new file mode 100644 index 0000000..8c2c529 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityAccidentInvestigationServiceImpl.java @@ -0,0 +1,41 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityAccidentInvestigationMapper; +import com.zcloud.service.comprehensive.TrafficSecurityAccidentInvestigationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSecurityAccidentInvestigationServiceImpl implements TrafficSecurityAccidentInvestigationService { + + @Autowired + private TrafficSecurityAccidentInvestigationMapper accidentInvestigationMapper; + @Override + public void save(PageData pd) { + accidentInvestigationMapper.save(pd); + } + + @Override + public List listForAccidentInvestigation(Page page) { + return accidentInvestigationMapper.datalistPage(page); + } + + @Override + public void delete(PageData pd) { + accidentInvestigationMapper.delete(pd); + } + + @Override + public PageData findById(PageData pd) { + return accidentInvestigationMapper.findById(pd); + } + + @Override + public void edit(PageData pd) { + accidentInvestigationMapper.edit(pd); + } +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCommitmentServiceImpl.java similarity index 88% rename from src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentServiceImpl.java rename to src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCommitmentServiceImpl.java index d57d295..f21d038 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCommitmentServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCommitmentServiceImpl.java @@ -1,15 +1,16 @@ -package com.zcloud.service.comprehensive; +package com.zcloud.service.comprehensive.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityCommitmentMapper; +import com.zcloud.service.comprehensive.TrafficSecurityCommitmentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service -public class TrafficSecurityCommitmentServiceImpl implements TrafficSecurityCommitmentService{ +public class TrafficSecurityCommitmentServiceImpl implements TrafficSecurityCommitmentService { @Autowired private TrafficSecurityCommitmentMapper securityCommitmentMapper; diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityEmployeesDetailsImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityEmployeesDetailsImpl.java similarity index 80% rename from src/main/java/com/zcloud/service/comprehensive/TrafficSecurityEmployeesDetailsImpl.java rename to src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityEmployeesDetailsImpl.java index caa6462..a7829b4 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityEmployeesDetailsImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityEmployeesDetailsImpl.java @@ -1,15 +1,16 @@ -package com.zcloud.service.comprehensive; +package com.zcloud.service.comprehensive.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityEmployeesDetailsMapper; +import com.zcloud.service.comprehensive.TrafficSecurityEmployeesDetailsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service -public class TrafficSecurityEmployeesDetailsImpl implements TrafficSecurityEmployeesDetailsService{ +public class TrafficSecurityEmployeesDetailsImpl implements TrafficSecurityEmployeesDetailsService { @Autowired private TrafficSecurityEmployeesDetailsMapper ecoDetailsMapper; diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java new file mode 100644 index 0000000..680dcfa --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementAgreementServiceImpl.java @@ -0,0 +1,40 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityManagementAgreementMapper; +import com.zcloud.service.comprehensive.TrafficSecurityManagementAgreementService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSecurityManagementAgreementServiceImpl implements TrafficSecurityManagementAgreementService { + @Autowired + private TrafficSecurityManagementAgreementMapper managementAgreementMapper; + @Override + public void save(PageData pd) { + managementAgreementMapper.save(pd); + } + + @Override + public void edit(PageData pd) { + managementAgreementMapper.edit(pd); + } + + @Override + public List listForManagementAgreementlist(Page page) { + return managementAgreementMapper.datalistPage(page); + } + + @Override + public PageData findById(PageData pd) { + return managementAgreementMapper.findById(pd); + } + + @Override + public void delete(PageData pd) { + managementAgreementMapper.delete(pd); + } +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java index d81c2fe..05ee69b 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityManagementStaffingServiceImpl.java @@ -33,4 +33,9 @@ public class TrafficSecurityManagementStaffingServiceImpl implements TrafficSecu public PageData findById(PageData pd) { return securityManagementStaffingMapper.findById(pd); } + + @Override + public void delete(PageData pd) { + securityManagementStaffingMapper.delete(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityViolationRegistrationServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityViolationRegistrationServiceImpl.java new file mode 100644 index 0000000..e4a361c --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityViolationRegistrationServiceImpl.java @@ -0,0 +1,40 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityViolationRegistrationMapper; +import com.zcloud.service.comprehensive.TrafficSecurityViolationRegistrationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSecurityViolationRegistrationServiceImpl implements TrafficSecurityViolationRegistrationService { + @Autowired + private TrafficSecurityViolationRegistrationMapper verificationRegistrationMapper; + @Override + public void save(PageData pd) { + verificationRegistrationMapper.save(pd); + } + + @Override + public List listForViolationRegistration(Page page) { + return verificationRegistrationMapper.datalistPage(page); + } + + @Override + public void delete(PageData pd) { + verificationRegistrationMapper.delete(pd); + } + + @Override + public PageData findById(PageData pd) { + return verificationRegistrationMapper.findById(pd); + } + + @Override + public void edit(PageData pd) { + verificationRegistrationMapper.edit(pd); + } +} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml index 1899471..1635d24 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyAssessmentMapper.xml @@ -101,6 +101,18 @@ SAFETYASSESSMENT_ID = #{SAFETYASSESSMENT_ID} + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + SAFETYASSESSMENT_ID = #{SAFETYASSESSMENT_ID} + + select diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml new file mode 100644 index 0000000..f931e1f --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml @@ -0,0 +1,359 @@ + + + + + + BUS_TRAFFIC_ACCIDENT_INVESTIGATION + + + + + SYS_DICTIONARIES + + + + + f.ACCIDENTINVESTIGATION_ID, + f.ACCIDENTDATE, + f.ACCIDENTLOCATION, + f.INJUREDPART, + f.CERTIFICATIONSTATUS, + f.EDUCATIONSITUATION, + f.ACCIDENTDESCRIPTION, + f.ACCIDENTNATURE, + f.USER_ID, + f.CONFIRMATIONTIME, + f.ACCIDENTANALYSIS, + f.PUNISHMENTOPINION, + f.RESPONSIBLEPERSON, + f.SECONDARYRESPONSIBLEPERSON, + f.PREVENTIVEMEASURES, + f.COMPLETIONSTATUS, + f.RECTIFICATIONRESPONSIBLEPERSON, + f.RECTIFICATIONTIME, + f.SUPERVISOROPINION, + f.SUPERVISORLEADER, + f.SUPERVISORCONFIRMATIONTIME, + f.SAFETYSUPERVISIONOPINION, + f.SAFETYSUPERVISIONDEPARTMENT, + f.SAFETYSUPERVISIONCONFIRMATIONTIME, + f.INSPECTOR, + f.INSPECTORCONFIRMATIONTIME, + f.CERTIFICATIONNUMBER, + f.WORKINJURYIDENTIFICATIONLEVEL, + f.ACCIDENTRECORDPERSON, + f.REGISTRATIONDATE, + f.ACCIDENTREPORTRECORD, + f.ACCIDENTANALYSISRECORD, + f.ACCIDENTNUMBER, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME, + f.AGE, + f.EDUCATIONALLEVEL, + f.DEPARTMENT, + f.JOBTYPE, + f.PARTY, + f.INCIDENTNUMBER, + f.ENTRYDATE + + + + + ACCIDENTINVESTIGATION_ID, + ACCIDENTDATE, + ACCIDENTLOCATION, + INJUREDPART, + CERTIFICATIONSTATUS, + EDUCATIONSITUATION, + ACCIDENTDESCRIPTION, + ACCIDENTNATURE, + USER_ID, + CONFIRMATIONTIME, + ACCIDENTANALYSIS, + PUNISHMENTOPINION, + RESPONSIBLEPERSON, + SECONDARYRESPONSIBLEPERSON, + PREVENTIVEMEASURES, + COMPLETIONSTATUS, + RECTIFICATIONRESPONSIBLEPERSON, + RECTIFICATIONTIME, + SUPERVISOROPINION, + SUPERVISORLEADER, + SUPERVISORCONFIRMATIONTIME, + SAFETYSUPERVISIONOPINION, + SAFETYSUPERVISIONDEPARTMENT, + SAFETYSUPERVISIONCONFIRMATIONTIME, + INSPECTOR, + INSPECTORCONFIRMATIONTIME, + CERTIFICATIONNUMBER, + WORKINJURYIDENTIFICATIONLEVEL, + ACCIDENTRECORDPERSON, + REGISTRATIONDATE, + ACCIDENTREPORTRECORD, + ACCIDENTANALYSISRECORD, + ACCIDENTNUMBER, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME, + AGE, + EDUCATIONALLEVEL, + DEPARTMENT, + JOBTYPE, + PARTY, + INCIDENTNUMBER, + ENTRYDATE + + + + + #{ACCIDENTINVESTIGATION_ID}, + #{ACCIDENTDATE}, + #{ACCIDENTLOCATION}, + #{INJUREDPART}, + #{CERTIFICATIONSTATUS}, + #{EDUCATIONSITUATION}, + #{ACCIDENTDESCRIPTION}, + #{ACCIDENTNATURE}, + #{USER_ID}, + #{CONFIRMATIONTIME}, + #{ACCIDENTANALYSIS}, + #{PUNISHMENTOPINION}, + #{RESPONSIBLEPERSON}, + #{SECONDARYRESPONSIBLEPERSON}, + #{PREVENTIVEMEASURES}, + #{COMPLETIONSTATUS}, + #{RECTIFICATIONRESPONSIBLEPERSON}, + #{RECTIFICATIONTIME}, + #{SUPERVISOROPINION}, + #{SUPERVISORLEADER}, + #{SUPERVISORCONFIRMATIONTIME}, + #{SAFETYSUPERVISIONOPINION}, + #{SAFETYSUPERVISIONDEPARTMENT}, + #{SAFETYSUPERVISIONCONFIRMATIONTIME}, + #{INSPECTOR}, + #{INSPECTORCONFIRMATIONTIME}, + #{CERTIFICATIONNUMBER}, + #{WORKINJURYIDENTIFICATIONLEVEL}, + #{ACCIDENTRECORDPERSON}, + #{REGISTRATIONDATE}, + #{ACCIDENTREPORTRECORD}, + #{ACCIDENTANALYSISRECORD}, + #{ACCIDENTNUMBER}, + #{ISDELETE}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME}, + #{AGE}, + #{EDUCATIONALLEVEL}, + #{DEPARTMENT}, + #{JOBTYPE}, + #{PARTY}, + #{INCIDENTNUMBER}, + #{ENTRYDATE} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + + + ACCIDENTDATE = #{ACCIDENTDATE}, + + + ACCIDENTLOCATION = #{ACCIDENTLOCATION}, + + + INJUREDPART = #{INJUREDPART}, + + + CERTIFICATIONSTATUS = #{CERTIFICATIONSTATUS}, + + + EDUCATIONSITUATION = #{EDUCATIONSITUATION}, + + + ACCIDENTDESCRIPTION = #{ACCIDENTDESCRIPTION}, + + + ACCIDENTNATURE = #{ACCIDENTNATURE}, + + + USER_ID = #{USER_ID}, + + + CONFIRMATIONTIME = #{CONFIRMATIONTIME}, + + + ACCIDENTANALYSIS = #{ACCIDENTANALYSIS}, + + + PUNISHMENTOPINION = #{PUNISHMENTOPINION}, + + + RESPONSIBLEPERSON = #{RESPONSIBLEPERSON}, + + + SECONDARYRESPONSIBLEPERSON = #{SECONDARYRESPONSIBLEPERSON}, + + + PREVENTIVEMEASURES = #{PREVENTIVEMEASURES}, + + + COMPLETIONSTATUS = #{COMPLETIONSTATUS}, + + + RECTIFICATIONRESPONSIBLEPERSON = #{RECTIFICATIONRESPONSIBLEPERSON}, + + + RECTIFICATIONTIME = #{RECTIFICATIONTIME}, + + + SUPERVISOROPINION = #{SUPERVISOROPINION}, + + + SUPERVISORLEADER = #{SUPERVISORLEADER}, + + + SUPERVISORCONFIRMATIONTIME = #{SUPERVISORCONFIRMATIONTIME}, + + + SAFETYSUPERVISIONOPINION = #{SAFETYSUPERVISIONOPINION}, + + + SAFETYSUPERVISIONDEPARTMENT = #{SAFETYSUPERVISIONDEPARTMENT}, + + + SAFETYSUPERVISIONCONFIRMATIONTIME = #{SAFETYSUPERVISIONCONFIRMATIONTIME}, + + + INSPECTOR = #{INSPECTOR}, + + + INSPECTORCONFIRMATIONTIME = #{INSPECTORCONFIRMATIONTIME}, + + + CERTIFICATIONNUMBER = #{CERTIFICATIONNUMBER}, + + + WORKINJURYIDENTIFICATIONLEVEL = #{WORKINJURYIDENTIFICATIONLEVEL}, + + + ACCIDENTRECORDPERSON = #{ACCIDENTRECORDPERSON}, + + + REGISTRATIONDATE = #{REGISTRATIONDATE}, + + + ACCIDENTREPORTRECORD = #{ACCIDENTREPORTRECORD}, + + + ACCIDENTANALYSISRECORD = #{ACCIDENTANALYSISRECORD}, + + + ACCIDENTNUMBER = #{ACCIDENTNUMBER}, + + + OPERATOR = #{OPERATOR}, + + + OPERATORNAME = #{OPERATORNAME}, + + + OPERATTIME = #{OPERATTIME}, + + + AGE = #{AGE}, + + + EDUCATIONALLEVEL = #{EDUCATIONALLEVEL}, + + + DEPARTMENT = #{DEPARTMENT}, + + + JOBTYPE = #{JOBTYPE}, + + + PARTY = #{PARTY}, + + + ENTRYDATE = #{ENTRYDATE} + + + where ACCIDENTINVESTIGATION_ID = #{ACCIDENTINVESTIGATION_ID} + + + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + ACCIDENTINVESTIGATION_ID = #{ACCIDENTINVESTIGATION_ID} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml new file mode 100644 index 0000000..09e7cae --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementAgreementMapper.xml @@ -0,0 +1,146 @@ + + + + + + BUS_TRAFFIC_MANAGEMENT_AGREEMENT + + + + + SYS_DICTIONARIES + + + + + f.MANAGEMENTAGREEMENT_ID, + f.MANAGEMENTAGREEMENTNAME, + f.COMPLETIONSTATUS, + f.VALIDSTATUS, + f.OPERATINGCOMPANY, + f.EXPIRYDATE, + f.OPERATINGTYPE, + f.ATTACHMENT_ROUTE, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME + + + + + MANAGEMENTAGREEMENT_ID, + MANAGEMENTAGREEMENTNAME, + COMPLETIONSTATUS, + VALIDSTATUS, + OPERATINGCOMPANY, + EXPIRYDATE, + OPERATINGTYPE, + ATTACHMENT_ROUTE, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME + + + + + #{MANAGEMENTAGREEMENT_ID}, + #{MANAGEMENTAGREEMENTNAME}, + #{COMPLETIONSTATUS}, + #{VALIDSTATUS}, + #{OPERATINGCOMPANY}, + #{EXPIRYDATE}, + #{OPERATINGTYPE}, + #{ATTACHMENT_ROUTE}, + #{ISDELETE}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME} + + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + OPERATOR = #{OPERATOR}, + OPERATORNAME = #{OPERATORNAME}, + OPERATTIME = #{OPERATTIME}, + EXPIRYDATE = #{EXPIRYDATE}, + ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE} + where + MANAGEMENTAGREEMENT_ID = #{MANAGEMENTAGREEMENT_ID} + + + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + MANAGEMENTAGREEMENT_ID = #{MANAGEMENTAGREEMENT_ID} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml index 3af03ad..8dd6376 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityManagementStaffingMapper.xml @@ -103,6 +103,18 @@ STAFFING_ID = #{STAFFING_ID} + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + STAFFING_ID = #{STAFFING_ID} + + + select + f.*, + i.CORP_NAME, + u.NAME, + u.PHONE + from + f + left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join sys_user u on f.USER_ID = u.USER_ID + where f.ISDELETE = '0' + + and f.USER_ID = #{pd.USER_ID} + + + and f.PENALTYTIME = #{pd.PENALTYTIME} + + + + + + diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index 842e2ab..b29ecfb 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -459,6 +459,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" u.PASSWORD, u.LAST_LOGIN, u.NAME, + u.SEX, u.IP, u.EMAIL, u.NUMBER,