From 7558066cb4206711397a060910a2db5d4eed7ea9 Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Thu, 21 Mar 2024 08:42:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=94=9F=E4=BA=A7=E6=9C=88?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=8C=E5=AE=89=E5=85=A8=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E6=89=8B=E5=86=8C=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91=20?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E7=99=BB=E8=AE=B0=EF=BC=8C=E5=9C=B0=E7=82=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppTrafficSafetyMeetingController.java | 6 +- .../TrafficSafetyActivitiesController.java | 180 ++++++++++++++++++ .../TrafficSafetyManualController.java | 179 +++++++++++++++++ ...cSecurityCustomerManagementController.java | 58 +++++- ...cSecurityLocationManagementController.java | 20 ++ .../TrafficSecurityNoticeController.java | 27 +-- ...SecurityWaybillRegistrationController.java | 52 ++++- .../controller/system/UsersController.java | 25 +++ .../TrafficSafetyActivitiesMapper.java | 20 ++ .../TrafficSafetyManualMapper.java | 20 ++ .../TrafficSecurityCustomerContactMapper.java | 10 + ...afficSecurityCustomerManagementMapper.java | 3 + ...afficSecurityLocationManagementMapper.java | 2 + .../TrafficSecurityReadDetailMapper.java | 2 + ...fficSecurityWaybillRegistrationMapper.java | 2 + .../mapper/datasource/system/UsersMapper.java | 2 + .../TrafficSafetyActivitiesService.java | 19 ++ .../TrafficSafetyManualService.java | 18 ++ ...fficSecurityCustomerManagementService.java | 4 + ...fficSecurityLocationManagementService.java | 2 + .../TrafficSecurityReadDetailService.java | 2 + ...ficSecurityWaybillRegistrationService.java | 2 + .../TrafficSafetyActivitiesServiceImpl.java | 40 ++++ .../impl/TrafficSafetyManualServiceImpl.java | 39 ++++ ...SecurityCustomerManagementServiceImpl.java | 13 ++ ...SecurityLocationManagementServiceImpl.java | 5 + .../impl/TrafficSecurityReadDetailImpl.java | 5 + ...ecurityWaybillRegistrationServiceImpl.java | 5 + .../zcloud/service/system/UsersService.java | 2 + .../service/system/impl/UsersServiceImpl.java | 5 + .../TrafficSafetyActivitiesMapper.xml | 146 ++++++++++++++ .../TrafficSafetyManualMapper.xml | 142 ++++++++++++++ .../TrafficSecurityCustomerContactMapper.xml | 84 ++++++++ ...rafficSecurityCustomerManagementMapper.xml | 27 ++- ...rafficSecurityLocationManagementMapper.xml | 12 ++ .../TrafficSecurityReadDetailMapper.xml | 12 ++ ...afficSecurityWaybillRegistrationMapper.xml | 20 +- .../mybatis/datasource/system/UsersMapper.xml | 24 +++ 38 files changed, 1198 insertions(+), 38 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyActivitiesMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyManualMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSafetyActivitiesService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSafetyManualService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyActivitiesServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyManualServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java index f925de7..08be2ab 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSafetyMeetingController.java @@ -43,9 +43,9 @@ public class AppTrafficSafetyMeetingController extends BaseController { if (Tools.notEmpty(MEETING_TITLE)) pd.put("MEETING_TITLE", MEETING_TITLE.trim()); - String MEETING_TYPE = pd.getString("MEETING_TYPE"); // 关键词检索条件 - if (Tools.notEmpty(MEETING_TYPE)) - pd.put("MEETING_TYPE", MEETING_TYPE.trim()); +// String MEETING_TYPE = pd.getString("MEETING_TYPE"); // 关键词检索条件 +// if (Tools.notEmpty(MEETING_TYPE)) +// pd.put("MEETING_TYPE", MEETING_TYPE.trim()); page.setPd(pd); List varList = trafficSafetyMeetingService.listForSafetyMeeting(page); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.java new file mode 100644 index 0000000..df021a1 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyActivitiesController.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.TrafficSafetyActivitiesService; +import com.zcloud.service.comprehensive.TrafficSafetyProductionService; +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("/activities") +public class TrafficSafetyActivitiesController extends BaseController { + @Autowired + private TrafficSafetyActivitiesService activeService; + @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 activities_Id = this.get32UUID(); + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("ACTIVITIES_ID", activities_Id); // 主键 + 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())); + } + + activeService.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())); + } + + activeService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + /** + * 列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value = "/listForSafetyActivitieslist") + @ResponseBody + public Object listForSafetyActivitieslist(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 = activeService.listForSafetyActivitieslist(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 = activeService.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()));//删除时间 + activeService.delete(pd); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java new file mode 100644 index 0000000..a6c92b0 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyManualController.java @@ -0,0 +1,179 @@ +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.TrafficSafetyManualService; +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("/manual") +public class TrafficSafetyManualController extends BaseController { + @Autowired + private TrafficSafetyManualService safetyManualService; + @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 manual_Id = this.get32UUID(); + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("OPERATINGCOMPANY", Jurisdiction.getCORPINFO_ID()); // 经营企业 + pd.put("MANUAL_ID", manual_Id); // 主键 + 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())); + } + + safetyManualService.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())); + } + + safetyManualService.edit(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + /** + * 列表 + * @param page + * @return + * @throws Exception + */ + @RequestMapping(value = "/listForSafetyManuallist") + @ResponseBody + public Object listForSafetyManuallist(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 = safetyManualService.listForSafetyManuallist(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 = safetyManualService.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()));//删除时间 + safetyManualService.delete(pd); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java index 0c33c39..69a2506 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -1,5 +1,6 @@ package com.zcloud.controller.comprehensive; +import com.alibaba.fastjson.JSON; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -32,24 +33,44 @@ public class TrafficSecurityCustomerManagementController extends BaseController @RequestMapping(value = "/add") @ResponseBody public Object add() throws Exception { - Map map = new HashMap(); + Map map = new HashMap<>(); String errInfo = "success"; - PageData pd = this.getPageData(); + PageData pd = this.getPageData(); // 获取页面提交的数据 - String customermanagement_id = this.get32UUID(); - pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id - pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 创建人id - pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 - pd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id); // 主键 - pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 - pd.put("ISDELETE", "0"); + String customermanagement_id = this.get32UUID(); // 生成主键ID + pd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id); // 设置客户管理ID + pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 设置运输公司ID + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 设置创建人ID + pd.put("CREATORNAME", Jurisdiction.getName()); // 设置创建人姓名 + pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 设置创建时间 + pd.put("ISDELETE", "0"); // 设置删除标志 customerManagementService.save(pd); + + if ( pd.getString("contacts") != null && ! pd.getString("contacts").isEmpty()){ + List contacts = JSON.parseArray(pd.getString("contacts"), PageData.class); + for (PageData contact : contacts) { + PageData contactPd = new PageData(); + contactPd.put("CUSTOMERCONTACT_ID", this.get32UUID()); + contactPd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id); + contactPd.put("CREATOR", Jurisdiction.getUSER_ID()); // 设置创建人ID + contactPd.put("CREATORNAME", Jurisdiction.getName()); // 设置创建人姓名 + contactPd.put("CREATETIME", DateUtil.date2Str(new Date())); // 设置创建时间 + contactPd.put("CONTACT", contact.get("CONTACT")); + contactPd.put("CONTACTPHONE", contact.get("CONTACTPHONE")); + contactPd.put("CUSTOMERADDRESS", contact.get("CUSTOMERADDRESS")); + contactPd.put("ISDELETE", "0"); // 设置删除标志 + + customerManagementService.saveContact(contactPd); + } + } + map.put("result", errInfo); map.put("pd", pd); return map; } + @RequestMapping(value = "/listForSecurityCustomerManagement") @ResponseBody public Object listForSecurityCustomerManagement(Page page) throws Exception { @@ -73,4 +94,23 @@ public class TrafficSecurityCustomerManagementController 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()));//删除时间 + customerManagementService.delete(pd); + map.put("result", errInfo); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java index 901d587..360b434 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityLocationManagementController.java @@ -72,4 +72,24 @@ public class TrafficSecurityLocationManagementController extends BaseController 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()));//删除时间 + locationManagementService.delete(pd); + map.put("result", errInfo); + return map; + } + } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java index 85fec93..80e874b 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java @@ -107,16 +107,16 @@ public class TrafficSecurityNoticeController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - String PRACTITIONER = pd.getString("PRACTITIONER"); // 关键词检索条件 + String PRACTITIONER = pd.getString("PRACTITIONER");// 关键词检索条件 if (Tools.notEmpty(PRACTITIONER)) pd.put("PRACTITIONER", PRACTITIONER.trim()); - String PRACTITIONERTYPE = pd.getString("PRACTITIONERTYPE"); // 关键词检索条件 + String PRACTITIONERTYPE = pd.getString("PRACTITIONERTYPE");// 关键词检索条件 if (Tools.notEmpty(PRACTITIONERTYPE)) pd.put("PRACTITIONERTYPE", PRACTITIONERTYPE.trim()); - String SIGNEDSTATUS = pd.getString("SIGNEDSTATUS"); // 关键词检索条件 + String SIGNEDSTATUS = pd.getString("SIGNEDSTATUS");// 关键词检索条件 if (Tools.notEmpty(SIGNEDSTATUS)) pd.put("SIGNEDSTATUS", SIGNEDSTATUS.trim()); - String REPLYSTATUS = pd.getString("REPLYSTATUS"); // 关键词检索条件 + String REPLYSTATUS = pd.getString("REPLYSTATUS");// 关键词检索条件 if (Tools.notEmpty(REPLYSTATUS)) pd.put("REPLYSTATUS", REPLYSTATUS.trim()); page.setPd(pd); @@ -135,11 +135,11 @@ public class TrafficSecurityNoticeController extends BaseController { String errInfo = "success"; PageData pd = this.getPageData(); - String TITLE = pd.getString("TITLE"); // 关键词检索条件 + String TITLE = pd.getString("TITLE");// 关键词检索条件 if (Tools.notEmpty(TITLE)) pd.put("TITLE", TITLE.trim()); - String REPLYSTATUS = pd.getString("REPLYSTATUS"); // 关键词检索条件 + String REPLYSTATUS = pd.getString("REPLYSTATUS");// 关键词检索条件 if (Tools.notEmpty(REPLYSTATUS)) pd.put("REPLYSTATUS", REPLYSTATUS.trim()); @@ -186,7 +186,7 @@ public class TrafficSecurityNoticeController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd = securityNoticeService.findById(pd); //根据ID读取 + pd = securityNoticeService.findById(pd);//根据ID读取 map.put("pd", pd); map.put("result", errInfo); return map; @@ -204,11 +204,12 @@ public class TrafficSecurityNoticeController extends BaseController { 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())); //删除时间 + pd.put("DELETOR", Jurisdiction.getUSER_ID());//删除人id + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人姓名 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 securityNoticeService.delete(pd); - map.put("result", errInfo); //返回结果 + securityReadDetail.delete(pd); + map.put("result", errInfo);//返回结果 return map; } @@ -229,7 +230,7 @@ public class TrafficSecurityNoticeController extends BaseController { String ArrayDATA_IDS[] = DATA_IDS.split(","); for (String id : ArrayDATA_IDS) { pd.put("NOTIFICATION_ID", id); - pd.put("DELETORNAME", Jurisdiction.getUsername()); //删除人 + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人 pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 securityNoticeService.delete(pd); } @@ -237,7 +238,7 @@ public class TrafficSecurityNoticeController extends BaseController { }else{ errInfo = "error"; } - map.put("result", errInfo); //返回结果 + map.put("result", errInfo);//返回结果 return map; } } diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java index 257cf35..0957d1d 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -81,9 +81,8 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); // 运输企业 pd.put("WAYBILLREGISTRATION_ID", waybillregistrationId); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 - pd.put("WAYBILLNUMBER", this.get32UUID()); // 添加时间 pd.put("ISDELETE", "0"); - Date shippingDate = DateUtil.str2Date(pd.getString("SHIPPINGDATE")); + Date shippingDate = DateUtil.fomatDate(pd.getString("SHIPPINGDATE")); if (shippingDate != null && shippingDate.after(new Date())) { pd.put("WAYBILLSTATUS", "1"); } else { @@ -96,4 +95,53 @@ public class TrafficSecurityWaybillRegistrationController extends BaseController map.put("pd", pd); 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()));//删除时间 + trafficSecurityWaybillRegistrationService.delete(pd); + map.put("result", errInfo); + return map; + } + + /**批量删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/deleteAll") + @ResponseBody + public Object deleteAll() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + String err=""; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if(Tools.notEmpty(DATA_IDS)){ + String ArrayDATA_IDS[] = DATA_IDS.split(","); + for (String id : ArrayDATA_IDS) { + pd.put("WAYBILLREGISTRATION_ID", id); + pd.put("DELETORNAME", Jurisdiction.getUsername());//删除人 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + trafficSecurityWaybillRegistrationService.delete(pd); + } + errInfo = "success"; + }else{ + errInfo = "error"; + } + map.put("result", errInfo);//返回结果 + return map; + } } diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 215e2a0..bee11e8 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -167,6 +167,31 @@ public class UsersController extends BaseController { return map; } + /** + * 根据从业类型查询用户 + * + * @param page + * @return + * @throws Exception + */ + @RequestMapping("/listSelectPersonType") + @ResponseBody + @LogAnno(menuType = "综合管理", menuServer = "特种设备", instructionsOperate = "设备管理", instructionsType = "用户列表") + public Object listSelectPersonType(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + page.setPd(pd); + List userList = usersService.userSelectPersonTypelistPage(page);//列出用户列表 + map.put("userList", userList); + map.put("page", page); + map.put("pd", pd); + + map.put("result", errInfo); + return map; + } /** * 去新增用户页面 diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyActivitiesMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyActivitiesMapper.java new file mode 100644 index 0000000..c02d2c9 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyActivitiesMapper.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 TrafficSafetyActivitiesMapper { + 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/TrafficSafetyManualMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyManualMapper.java new file mode 100644 index 0000000..3a0b194 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyManualMapper.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 TrafficSafetyManualMapper { + 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/TrafficSecurityCustomerContactMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java new file mode 100644 index 0000000..eebfbde --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerContactMapper.java @@ -0,0 +1,10 @@ +package com.zcloud.mapper.datasource.comprehensive; + +import com.zcloud.entity.PageData; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TrafficSecurityCustomerContactMapper { + void saveContact(PageData contactPd); + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java index 91e6911..629dda9 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java @@ -22,4 +22,7 @@ public interface TrafficSecurityCustomerManagementMapper { */ List datalistPage(Page page); + + void delete(PageData pd); + } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java index 7beb4d6..44bfb53 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityLocationManagementMapper.java @@ -21,4 +21,6 @@ public interface TrafficSecurityLocationManagementMapper { * @return */ List datalistPage(Page page); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java index 4e4dd1f..3fce7a4 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java @@ -14,4 +14,6 @@ public interface TrafficSecurityReadDetailMapper { public List listByUserId (Page page); void edit(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java index 0c4b5fe..3f92b08 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java @@ -19,4 +19,6 @@ public interface TrafficSecurityWaybillRegistrationMapper { void save(PageData pd); PageData forSecurityPerson(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java index 9a8a742..2fa6294 100644 --- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java @@ -269,4 +269,6 @@ public interface UsersMapper { List simplelistPage(Page page); List getByUserId(PageData entity); + + List userSelectPersonTypelistPage(Page page); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyActivitiesService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyActivitiesService.java new file mode 100644 index 0000000..34965e0 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyActivitiesService.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 TrafficSafetyActivitiesService { + + void save(PageData pd); + + void edit(PageData pd); + + List listForSafetyActivitieslist(Page page); + + PageData findById(PageData pd); + + void delete(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyManualService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyManualService.java new file mode 100644 index 0000000..bf195db --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyManualService.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 TrafficSafetyManualService { + void save(PageData pd); + + void edit(PageData pd); + + List listForSafetyManuallist(Page page); + + PageData findById(PageData pd); + + void delete(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java index eee3c70..b5d3f07 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java @@ -9,4 +9,8 @@ public interface TrafficSecurityCustomerManagementService { void save(PageData pd); List listForSecurityCustomerManagement(Page page); + + void saveContact(PageData contactPd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java index ded24b4..e753bb0 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityLocationManagementService.java @@ -9,4 +9,6 @@ public interface TrafficSecurityLocationManagementService { void save(PageData pd); List listForSecurityLocationManagement(Page page); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java index d4c1534..9abe8fa 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java @@ -13,4 +13,6 @@ public interface TrafficSecurityReadDetailService { List listByUserId(Page page) throws Exception; void edit(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java index f145a3f..d1a4869 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java @@ -11,4 +11,6 @@ public interface TrafficSecurityWaybillRegistrationService { void save(PageData pd); PageData forSecurityPerson(PageData pd); + + void delete(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyActivitiesServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyActivitiesServiceImpl.java new file mode 100644 index 0000000..f017b5e --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyActivitiesServiceImpl.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.TrafficSafetyActivitiesMapper; +import com.zcloud.service.comprehensive.TrafficSafetyActivitiesService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSafetyActivitiesServiceImpl implements TrafficSafetyActivitiesService { + @Autowired + private TrafficSafetyActivitiesMapper accessMapper; + @Override + public void save(PageData pd) { + accessMapper.save(pd); + } + + @Override + public void edit(PageData pd) { + accessMapper.edit(pd); + } + + @Override + public List listForSafetyActivitieslist(Page page) { + return accessMapper.datalistPage(page); + } + + @Override + public PageData findById(PageData pd) { + return accessMapper.findById(pd); + } + + @Override + public void delete(PageData pd) { + accessMapper.delete(pd); + } +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyManualServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyManualServiceImpl.java new file mode 100644 index 0000000..5525aad --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyManualServiceImpl.java @@ -0,0 +1,39 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyManualMapper; +import com.zcloud.service.comprehensive.TrafficSafetyManualService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +public class TrafficSafetyManualServiceImpl implements TrafficSafetyManualService { + @Autowired + private TrafficSafetyManualMapper strategyMapper; + @Override + public void save(PageData pd) { + strategyMapper.save(pd); + } + + @Override + public void edit(PageData pd) { + strategyMapper.edit(pd); + } + + @Override + public List listForSafetyManuallist(Page page) { + return strategyMapper.datalistPage(page); + } + + @Override + public PageData findById(PageData pd) { + return strategyMapper.findById(pd); + } + + @Override + public void delete(PageData pd) { + strategyMapper.delete(pd); + } +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java index 69a4554..b9efa57 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java @@ -2,6 +2,7 @@ package com.zcloud.service.comprehensive.impl; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityCustomerContactMapper; import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityCustomerManagementMapper; import com.zcloud.service.comprehensive.TrafficSecurityCustomerManagementService; import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +14,8 @@ import java.util.List; public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecurityCustomerManagementService { @Autowired private TrafficSecurityCustomerManagementMapper customerManagementMapper; + @Autowired + private TrafficSecurityCustomerContactMapper customerContactMapper; @Override public void save(PageData pd) { customerManagementMapper.save(pd); @@ -22,4 +25,14 @@ public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecu public List listForSecurityCustomerManagement(Page page) { return customerManagementMapper.datalistPage(page); } + + @Override + public void saveContact(PageData contactPd) { + customerContactMapper.saveContact(contactPd); + } + + @Override + public void delete(PageData pd) { + customerManagementMapper.delete(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java index d76a2b4..1e71aa5 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityLocationManagementServiceImpl.java @@ -22,4 +22,9 @@ public class TrafficSecurityLocationManagementServiceImpl implements TrafficSecu public List listForSecurityLocationManagement(Page page) { return locationManagementMapper.datalistPage(page); } + + @Override + public void delete(PageData pd) { + locationManagementMapper.delete(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java index 3cbdf4b..a30a39b 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java @@ -33,4 +33,9 @@ public class TrafficSecurityReadDetailImpl implements TrafficSecurityReadDetailS public void edit(PageData pd) { securityReadDetailMapper.edit(pd); } + + @Override + public void delete(PageData pd) { + securityReadDetailMapper.delete(pd); + } } diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java index 4b8d04d..16e7d72 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java @@ -28,4 +28,9 @@ public class TrafficSecurityWaybillRegistrationServiceImpl implements TrafficSec public PageData forSecurityPerson(PageData pd) { return TrafficSecurityWaybillRegistrationMapper.forSecurityPerson(pd); } + + @Override + public void delete(PageData pd) { + TrafficSecurityWaybillRegistrationMapper.delete(pd); + } } diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java index 8893c85..314a4f4 100644 --- a/src/main/java/com/zcloud/service/system/UsersService.java +++ b/src/main/java/com/zcloud/service/system/UsersService.java @@ -316,4 +316,6 @@ public interface UsersService { PageData getInfo(PageData request) throws Exception; void setState(PageData request) throws Exception; + + List userSelectPersonTypelistPage(Page page); } diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index d845901..e0946b5 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -649,4 +649,9 @@ public class UsersServiceImpl implements UsersService { public void setState(PageData request) throws Exception { usersMapper.editUser(request); } + + @Override + public List userSelectPersonTypelistPage(Page page) { + return usersMapper.userSelectPersonTypelistPage(page); + } } diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml new file mode 100644 index 0000000..c01558d --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyActivitiesMapper.xml @@ -0,0 +1,146 @@ + + + + + + BUS_TRAFFIC_SAFETY_ACTIVITIES + + + + + SYS_DICTIONARIES + + + + + f.ACTIVITIES_ID, + f.ACTIVITIESNAME, + f.COMPLETIONSTATUS, + f.CYCLE, + f.VALIDSTATUS, + f.OPERATINGCOMPANY, + f.EXPIRYDATE, + f.ATTACHMENT_ROUTE, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME + + + + + ACTIVITIES_ID, + ACTIVITIESNAME, + COMPLETIONSTATUS, + CYCLE, + VALIDSTATUS, + OPERATINGCOMPANY, + EXPIRYDATE, + ATTACHMENT_ROUTE, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME + + + + + #{ACTIVITIES_ID}, + #{ACTIVITIESNAME}, + #{COMPLETIONSTATUS}, + #{CYCLE}, + #{VALIDSTATUS}, + #{OPERATINGCOMPANY}, + #{EXPIRYDATE}, + #{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}, + CYCLE = #{CYCLE}, + ATTACHMENT_ROUTE=#{ATTACHMENT_ROUTE} + where + ACTIVITIES_ID = #{ACTIVITIES_ID} + + + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + ACTIVITIES_ID = #{ACTIVITIES_ID} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml new file mode 100644 index 0000000..2857c78 --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyManualMapper.xml @@ -0,0 +1,142 @@ + + + + + + BUS_TRAFFIC_SAFETY_MANUAL + + + + + SYS_DICTIONARIES + + + + + f.MANUAL_ID, + f.MANUALNAME, + f.COMPLETIONSTATUS, + f.VALIDSTATUS, + f.OPERATINGCOMPANY, + f.EXPIRYDATE, + f.ATTACHMENT_ROUTE, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME + + + + + MANUAL_ID, + MANUALNAME, + COMPLETIONSTATUS, + VALIDSTATUS, + OPERATINGCOMPANY, + EXPIRYDATE, + ATTACHMENT_ROUTE, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME + + + + + #{MANUAL_ID}, + #{MANUALNAME}, + #{COMPLETIONSTATUS}, + #{VALIDSTATUS}, + #{OPERATINGCOMPANY}, + #{EXPIRYDATE}, + #{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 + MANUAL_ID = #{MANUAL_ID} + + + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + MANUAL_ID = #{MANUAL_ID} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml new file mode 100644 index 0000000..469f985 --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerContactMapper.xml @@ -0,0 +1,84 @@ + + + + + BUS_TRAFFIC_CUSTOMER_CONTACT + + + + + SYS_DICTIONARIES + + + + + f.CUSTOMERCONTACT_ID, + f.CUSTOMERMANAGEMENT_ID, + f.CONTACT, + f.CONTACTPHONE, + f.CUSTOMERADDRESS, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME + + + + + CUSTOMERCONTACT_ID, + CUSTOMERMANAGEMENT_ID, + CONTACT, + CONTACTPHONE, + CUSTOMERADDRESS, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME + + + + + #{CUSTOMERCONTACT_ID}, + #{CUSTOMERMANAGEMENT_ID}, + #{CONTACT}, + #{CONTACTPHONE}, + #{CUSTOMERADDRESS}, + #{ISDELETE}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME} + + + + + + insert into + + ( + + ) values ( + + ) + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml index 1439030..a77c257 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml @@ -15,9 +15,6 @@ f.CUSTOMERMANAGEMENT_ID, f.CUSTOMERTYPE, f.CUSTOMERNAME, - f.CONTACT, - f.CONTACTPHONE, - f.CUSTOMERADDRESS, f.TRANSPORTATIONCOMPANY, f.ISDELETE, f.DELETOR, @@ -36,9 +33,6 @@ CUSTOMERMANAGEMENT_ID, CUSTOMERTYPE, CUSTOMERNAME, - CONTACT, - CONTACTPHONE, - CUSTOMERADDRESS, TRANSPORTATIONCOMPANY, ISDELETE, DELETOR, @@ -57,9 +51,6 @@ #{CUSTOMERMANAGEMENT_ID}, #{CUSTOMERTYPE}, #{CUSTOMERNAME}, - #{CONTACT}, - #{CONTACTPHONE}, - #{CUSTOMERADDRESS}, #{TRANSPORTATIONCOMPANY}, #{ISDELETE}, #{DELETOR}, @@ -84,14 +75,30 @@ ) + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + CUSTOMERMANAGEMENT_ID = #{CUSTOMERMANAGEMENT_ID} + + select diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml index afdfbaa..f6c968d 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml @@ -104,6 +104,18 @@ ) + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + NOTIFICATION_ID = #{NOTIFICATION_ID} + + select f.*, - i.CORP_NAME + i.CORP_NAME, + u.NAME, + b.LOCATIONNAME AS ORIGIN_NAME, + b2.LOCATIONNAME AS DESTINATION_NAME from f left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID + left join sys_user u on f.PRACTITIONER = u.USER_ID + left join bus_traffic_location_management b on f.ORIGIN = b.LOCATIONMANAGEMENT_ID + left join bus_traffic_location_management b2 on f.DESTINATION = b2.LOCATIONMANAGEMENT_ID where f.ISDELETE = '0' and f.WAYBILLSTATUS = #{pd.WAYBILLSTATUS} diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index b29ecfb..3302af1 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -1559,4 +1559,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where f.USER_ID = #{USER_ID} + + + +