From c12d2c7774c41013e207bd1f432857df4b584eec Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Wed, 28 Feb 2024 19:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=80=9A=E7=9F=A5->=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=20=E8=BF=90=E5=8D=95=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E5=90=8E=E7=AB=AF=E5=8A=9F=E8=83=BD=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E5=90=8E=E7=AB=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppTrafficSecurityNoticeController.java | 120 +++++++++++++ .../TrafficDrivingLogController.java | 16 +- ...afficSafetyDrivingCommitmenController.java | 44 +++++ .../TrafficSafetyThingsCheckController.java | 56 ++++++ ...cSecurityCustomerManagementController.java | 75 ++++++++ .../TrafficSecurityNoticeController.java | 107 +++++++++--- ...SecurityWaybillRegistrationController.java | 91 ++++++++++ .../TrafficSafetyDrivingCommitmentMapper.java | 17 ++ .../TrafficSafetyThingsCheckMapper.java | 19 +++ ...afficSecurityCustomerManagementMapper.java | 20 +++ .../TrafficSecurityNoticeMapper.java | 1 + .../TrafficSecurityReadDetailMapper.java | 4 + ...fficSecurityWaybillRegistrationMapper.java | 22 +++ .../TrafficSafetyDrivingCommitmenService.java | 10 ++ .../TrafficSafetyThingsCheckService.java | 12 ++ ...fficSecurityCustomerManagementService.java | 12 ++ .../TrafficSecurityNoticeService.java | 1 + .../TrafficSecurityReadDetailService.java | 4 + ...ficSecurityWaybillRegistrationService.java | 14 ++ ...fficSafetyDrivingCommitmenServiceImpl.java | 21 +++ .../TrafficSafetyThingsCheckServiceImpl.java | 25 +++ ...SecurityCustomerManagementServiceImpl.java | 25 +++ .../TrafficSecurityNoticeServiceImpl.java | 5 +- .../impl/TrafficSecurityReadDetailImpl.java | 11 ++ ...ecurityWaybillRegistrationServiceImpl.java | 31 ++++ .../TrafficSafetyDrivingCommitmentMapper.xml | 85 +++++++++ .../TrafficSafetyThingsCheckMapper.xml | 97 +++++++++++ ...rafficSecurityCustomerManagementMapper.xml | 103 +++++++++++ .../TrafficSecurityNoticeMapper.xml | 42 +++-- .../TrafficSecurityReadDetailMapper.xml | 83 +++++++-- ...afficSecurityWaybillRegistrationMapper.xml | 161 ++++++++++++++++++ 31 files changed, 1281 insertions(+), 53 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyDrivingCommitmenController.java create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyThingsCheckController.java create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java create mode 100644 src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyDrivingCommitmentMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyThingsCheckMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSafetyDrivingCommitmenService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSafetyThingsCheckService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyDrivingCommitmenServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyThingsCheckServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java create mode 100644 src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyDrivingCommitmentMapper.xml create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyThingsCheckMapper.xml create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml create mode 100644 src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml diff --git a/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java new file mode 100644 index 0000000..88b139d --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/AppTrafficSecurityNoticeController.java @@ -0,0 +1,120 @@ +package com.zcloud.controller.comprehensive; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.comprehensive.TrafficSecurityNoticeService; +import com.zcloud.service.comprehensive.TrafficSecurityReadDetailService; +import com.zcloud.service.notice.NoticeCorpService; +import com.zcloud.service.notice.ServiceNoticeService; +import com.zcloud.service.system.UsersService; +import com.zcloud.util.Const; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +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("/app/trafficNotice") +public class AppTrafficSecurityNoticeController extends BaseController { + @Autowired + private TrafficSecurityNoticeService securityNoticeService; + @Autowired + private TrafficSecurityReadDetailService trafficSecurityReadDetailService; + @Autowired + private TrafficSecurityReadDetailService securityReadDetail; + + /**删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/delete") + // @RequiresPermissions("traininginfo:del") + @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())); //删除时间 + securityNoticeService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } + + @RequestMapping(value = "/edit") + @ResponseBody + public Object edit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + pd.put("SIGNEDDATE",DateUtil.date2Str(new Date())); // 签收时间 + pd.put("SIGNING", "1"); //设置签收情况 + if (pd.getString("REPLYCONTENT") != null && !pd.getString("REPLYCONTENT").isEmpty()) { + pd.put("REPLYDATE", DateUtil.date2Str(new Date())); //设置回复时间 + pd.put("REPLY", "1"); //设置回复情况 + } + securityReadDetail.edit(pd); + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + /** 企业公告信息统计 + * @param page + * @throws Exception + */ + @RequestMapping(value="/getRedPoint") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "通知公告",instructionsOperate = "通知公告",instructionsType = "企业公告信息") + public Object getRedPoint() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd.put("USER_ID", pd.getString("loginUserId")); + pd = this.getPageData(); + pd.put("PERSON", Jurisdiction.getName()); + int count1 = securityNoticeService.getRedPoint(pd); + //int count2 = noticeService.getRedPoint(pd); + map.put("count", count1); + map.put("result", errInfo); + return map; + } + + /** 企业公告信息列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/listForCp") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "通知公告",instructionsOperate = "通知公告",instructionsType = "企业公告信息") + public Object listForCp(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + /* + * 1.获取关系信息 + * 2.根据关系信息找到公告信息 + */ + pd.put("USER_ID", Jurisdiction.getUSER_ID()); + page.setPd(pd); + List varList = trafficSecurityReadDetailService.listByUserId(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingLogController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingLogController.java index fc9f6bd..b49760a 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingLogController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficDrivingLogController.java @@ -35,14 +35,26 @@ public class TrafficDrivingLogController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); - String TRANSPORTCOMPANY = pd.getString("TRANSPORTCOMPANY"); // 关键词检索条件 + String TRANSPORTCOMPANY = pd.getString("TRANSPORTCOMPANY"); // 运输企业 if (Tools.notEmpty(TRANSPORTCOMPANY)) pd.put("TRANSPORTCOMPANY", TRANSPORTCOMPANY.trim()); - String TRANSPORTVEHICLE = pd.getString("TRANSPORTVEHICLE"); // 关键词检索条件 + String TRANSPORTVEHICLE = pd.getString("TRANSPORTVEHICLE"); // 运输车辆 if (Tools.notEmpty(TRANSPORTVEHICLE)) pd.put("TRANSPORTVEHICLE", TRANSPORTVEHICLE.trim()); + String EMPLOYEES = pd.getString("EMPLOYEES"); // 从业人员 + if (Tools.notEmpty(EMPLOYEES)) + pd.put("EMPLOYEES", EMPLOYEES.trim()); + + String DRIVINGCONDITION = pd.getString("DRIVINGCONDITION"); // 行车状态 + if (Tools.notEmpty(DRIVINGCONDITION)) + pd.put("DRIVINGCONDITION", DRIVINGCONDITION.trim()); + + String DEPARTURETIME = pd.getString("DEPARTURETIME"); // 起运时间 + if (Tools.notEmpty(DEPARTURETIME)) + pd.put("DEPARTURETIME", DEPARTURETIME.trim()); + page.setPd(pd); List varList = trafficDrivingLogService.listForDrivingLog(page); map.put("varList", varList); diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyDrivingCommitmenController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyDrivingCommitmenController.java new file mode 100644 index 0000000..1ad074a --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyDrivingCommitmenController.java @@ -0,0 +1,44 @@ +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.TrafficSafetyDrivingCommitmenService; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/drivingcommitmen") +public class TrafficSafetyDrivingCommitmenController extends BaseController { + + @Autowired + private TrafficSafetyDrivingCommitmenService trafficSafetyDrivingCommitmenService; + //列表 + @RequestMapping(value = "/listForSafetyDrivingCommitmen") + @ResponseBody + public Object listForSecurityNotice(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + String TRANSPORTCOMPANY = pd.getString("TRANSPORTCOMPANY"); // 运输企业 + if (Tools.notEmpty(TRANSPORTCOMPANY)) + pd.put("TRANSPORTCOMPANY", TRANSPORTCOMPANY.trim()); + + + page.setPd(pd); + List varList = trafficSafetyDrivingCommitmenService.listForDrivingCommitmenk(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } +} diff --git a/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyThingsCheckController.java b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyThingsCheckController.java new file mode 100644 index 0000000..7e3a512 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSafetyThingsCheckController.java @@ -0,0 +1,56 @@ +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.TrafficSafetyThingsCheckService; +import com.zcloud.util.Const; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +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("/thingscheck") +public class TrafficSafetyThingsCheckController extends BaseController { + + @Autowired + private TrafficSafetyThingsCheckService trafficSafetyThingsCheckService; + + //列表 + @RequestMapping(value = "/listForSafetyThingsCheck") + @ResponseBody + public Object listForSecurityNotice(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + String TRANSPORTCOMPANY = pd.getString("TRANSPORTCOMPANY"); // 运输企业 + if (Tools.notEmpty(TRANSPORTCOMPANY)) + pd.put("TRANSPORTCOMPANY", TRANSPORTCOMPANY.trim()); + + String CHECKITEMTYPE = pd.getString("CHECKITEMTYPE"); // 运输车辆 + if (Tools.notEmpty(CHECKITEMTYPE)) + pd.put("CHECKITEMTYPE", CHECKITEMTYPE.trim()); + + page.setPd(pd); + List varList = trafficSafetyThingsCheckService.listForThingsCheck(page); + map.put("varList", varList); + map.put("page", page); + 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 new file mode 100644 index 0000000..d2e28d0 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityCustomerManagementController.java @@ -0,0 +1,75 @@ +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.TrafficSecurityCustomerManagementService; +import com.zcloud.service.comprehensive.TrafficSecurityNoticeService; +import com.zcloud.util.Const; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +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("/securitycustomer") +public class TrafficSecurityCustomerManagementController extends BaseController { + @Autowired + private TrafficSecurityCustomerManagementService customerManagementService; + + //新增 + @RequestMapping(value = "/add") + @ResponseBody + public Object add(@RequestParam(value="fileList",required=false) MultipartFile file, @RequestParam(value="videoList",required=false) MultipartFile videoFile) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + String customermanagement_id = this.get32UUID(); + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + pd.put("CUSTOMERMANAGEMENT_ID", customermanagement_id); // 主键 + pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 + pd.put("ISDELETE", "0"); + + customerManagementService.save(pd); + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + @RequestMapping(value = "/listForSecurityCustomerManagement") + @ResponseBody + public Object listForSecurityCustomerManagement(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + String CUSTOMERTYPE = pd.getString("CUSTOMERTYPE"); // 关键词检索条件 + if (Tools.notEmpty(CUSTOMERTYPE)) + pd.put("CUSTOMERTYPE", CUSTOMERTYPE.trim()); + + String TRANSPORTATIONCOMPANY = pd.getString("TRANSPORTATIONCOMPANY"); // 关键词检索条件 + if (Tools.notEmpty(TRANSPORTATIONCOMPANY)) + pd.put("REPLYSTTRANSPORTATIONCOMPANYATUS", TRANSPORTATIONCOMPANY.trim()); + + page.setPd(pd); + List varList = customerManagementService.listForSecurityCustomerManagement(page); + map.put("varList", varList); + map.put("page", page); + 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 d0632cf..f41b751 100644 --- a/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityNoticeController.java @@ -17,6 +17,8 @@ import org.springframework.web.multipart.MultipartFile; import java.util.*; +import static org.apache.logging.log4j.ThreadContext.isEmpty; + @Controller @RequestMapping("/securitynotice") public class TrafficSecurityNoticeController extends BaseController { @@ -27,13 +29,11 @@ public class TrafficSecurityNoticeController extends BaseController { private TrafficSecurityReadDetailService securityReadDetail; @Autowired private Smb smb; - @Autowired - private UsersService usersService; //新增 @RequestMapping(value = "/add") @ResponseBody - public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file) throws Exception { + public Object add(@RequestParam(value="fileList",required=false) MultipartFile file,@RequestParam(value="videoList",required=false) MultipartFile videoFile) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = this.getPageData(); @@ -45,14 +45,13 @@ public class TrafficSecurityNoticeController extends BaseController { pd.put("NOTIFICATION_ID", notificationId); // 主键 pd.put("CREATETIME", DateUtil.date2Str(new Date())); // 添加时间 pd.put("POSTSTATUS", "1"); // 发布状态 - pd.put("REPLYSTATUS", "0"); // 回复状态 pd.put("SIGNEDSTATUS", "0"); // 签收状态 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) && !"mp4".equals(suffixName)) { + if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName)) { errInfo = "fail"; map.put("result", errInfo); map.put("msg", "文件格式不正确！"); @@ -60,24 +59,37 @@ public class TrafficSecurityNoticeController extends BaseController { } String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); - pd.put("CONFIRM_MESSAGE_SIGN_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd.put("CONFIRM_MESSAGE",pd.getString("CREATORNAME")); + pd.put("ATTACHMENT_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd.put("ATTACHMENT_NAME",pd.getString("CREATORNAME")); pd.put("CONFIRM_MESSAGE_TIME",DateUtil.date2Str(new Date())); } - List notifications = securityNoticeService.getAllNotifications(pd); - Map statusCount = new HashMap<>(); - statusCount.put("total", notifications.size()); - statusCount.put("signed", (int) notifications.stream().filter(n -> "1".equals(n.getString("SIGNEDSTATUS"))).count()); - statusCount.put("replied", (int) notifications.stream().filter(n -> "1".equals(n.getString("REPLYSTATUS"))).count()); - pd.put("SIGNING", statusCount.get("signed") + "/" + statusCount.get("total") + "人"); // 签收情况 - pd.put("REPLY", statusCount.get("replied") + "/" + statusCount.get("total") + "人"); // 回复情况 + // 处理 videoFile + if (videoFile != null && StringUtils.isNotBlank(pd.getString("CREATORNAME"))) { + String videoSuffixName = videoFile.getOriginalFilename().substring(videoFile.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase(); + if (!"mp4".equals(videoSuffixName)) { + errInfo = "fail"; + map.put("result", errInfo); + map.put("msg", "视频文件格式不正确！"); + return map; + } + String videoFileName = this.get32UUID() + videoFile.getOriginalFilename().substring(videoFile.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(videoFile, videoFileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + pd.put("VIDEO_ROUTE", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + videoFileName); + pd.put("VIDEO_NAME",pd.getString("CREATORNAME")); + } + + pd.put("SIGNING", "0"); // 签收情况 + pd.put("REPLY", "0"); // 回复情况 securityNoticeService.save(pd); - String[] persons = pd.getString("PERSON").split(","); - for (String person : persons) { + String[] personIds = pd.getString("PERSON_ID").split(","); + for (String personId : personIds) { pd.put("NOTIFICATION_ID", notificationId); - pd.put("PERSON", person.trim()); + pd.put("PERSON_ID", personId.trim()); + pd.put("READDETAIL_ID", this.get32UUID()); // 主键 + pd.put("REPLYSTATUS", "0"); // 主键 + pd.put("SIGNEDSTATUS", "0"); // 主键 securityReadDetail.save(pd); } map.put("result", errInfo); @@ -87,7 +99,6 @@ public class TrafficSecurityNoticeController extends BaseController { //阅读情况 @RequestMapping(value = "/getAllReadDetail") - // @RequiresPermissions("hidden:list") @ResponseBody public Object getAllReadDetail(Page page) throws Exception { Map map = new HashMap(); @@ -120,8 +131,7 @@ public class TrafficSecurityNoticeController extends BaseController { public Object listForSecurityNotice(Page page) throws Exception { Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); + PageData pd = this.getPageData(); String TITLE = pd.getString("TITLE"); // 关键词检索条件 if (Tools.notEmpty(TITLE)) @@ -132,13 +142,39 @@ public class TrafficSecurityNoticeController extends BaseController { pd.put("REPLYSTATUS", REPLYSTATUS.trim()); page.setPd(pd); - List varList = securityNoticeService.listForSecurityNotice(page); // 列出Hidden列表 + List varList = securityNoticeService.listForSecurityNotice(page); + + long replyStatusNum = 0; + long signedStatusNum = 0; + for (PageData data : varList) { + pd.put("NOTIFICATION_ID", data.get("NOTIFICATION_ID")); + page.setPd(pd); + List readDetail = securityReadDetail.getAllReadDetail(page); + + long currentReplyStatusNum = readDetail.stream() + .filter(d -> "1".equals(d.getString("REPLY"))) + .count(); + long currentSignedStatusNum = readDetail.stream() + .filter(d -> "1".equals(d.getString("SIGNING"))) + .count(); + long currentTotalReadDetail = readDetail.size(); + + replyStatusNum += currentReplyStatusNum; + signedStatusNum += currentSignedStatusNum; + + data.put("TOTALREADDETAIL", currentTotalReadDetail); + data.put("REPLYSTATUSNUM", currentReplyStatusNum); + data.put("SIGNEDSTATUSNUM", currentSignedStatusNum); + } + map.put("REPLYSTATUSNUM", String.valueOf(replyStatusNum)); + map.put("SIGNEDSTATUSNUM", String.valueOf(signedStatusNum)); map.put("varList", varList); map.put("page", page); map.put("result", errInfo); return map; } + //详情 @RequestMapping(value="/goEdit") // @RequiresPermissions("traininginfo:edit") @@ -173,4 +209,33 @@ public class TrafficSecurityNoticeController extends BaseController { 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("NOTIFICATION_ID", id); + pd.put("DELETORNAME", Jurisdiction.getUsername()); //删除人 + pd.put("DELETETIME", DateUtil.date2Str(new Date()));//删除时间 + securityNoticeService.delete(pd); + } + errInfo = "success"; + }else{ + errInfo = "error"; + } + 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 new file mode 100644 index 0000000..8cfd4a7 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/TrafficSecurityWaybillRegistrationController.java @@ -0,0 +1,91 @@ +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.TrafficSecurityWaybillRegistrationService; +import com.zcloud.util.Const; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +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("/waybillregistration") +public class TrafficSecurityWaybillRegistrationController extends BaseController { + + @Autowired + private TrafficSecurityWaybillRegistrationService trafficSecurityWaybillRegistrationService; + @RequestMapping(value = "/listForSecurityWaybillre") + @ResponseBody + public Object listForSecurityWaybillRegistra(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + + String TITLE = pd.getString("TITLE"); // 关键词检索条件 + if (Tools.notEmpty(TITLE)) + pd.put("TITLE", TITLE.trim()); + + String REPLYSTATUS = pd.getString("REPLYSTATUS"); // 关键词检索条件 + if (Tools.notEmpty(REPLYSTATUS)) + pd.put("REPLYSTATUS", REPLYSTATUS.trim()); + + page.setPd(pd); + List varList = trafficSecurityWaybillRegistrationService.listForSecurityNotice(page); + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + @RequestMapping(value = "/forSecurityPerson") + @ResponseBody + public Object forSecurityPerson() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("TRANSPORTATIONCOMPANY", Jurisdiction.getCORPINFO_ID()); + pd = trafficSecurityWaybillRegistrationService.forSecurityPerson(pd); + pd.put("PRACTITIONER", Jurisdiction.getName()); + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + //新增 + @RequestMapping(value = "/add") + @ResponseBody + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + String waybillregistrationId = this.get32UUID(); + + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + 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"); + trafficSecurityWaybillRegistrationService.save(pd); + + map.put("result", errInfo); + map.put("pd", pd); + return map; + } +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyDrivingCommitmentMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyDrivingCommitmentMapper.java new file mode 100644 index 0000000..33ff466 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyDrivingCommitmentMapper.java @@ -0,0 +1,17 @@ +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 TrafficSafetyDrivingCommitmentMapper { + /** + * 列表 + * @param page + * @return + */ + List datalistPage(Page page); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyThingsCheckMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyThingsCheckMapper.java new file mode 100644 index 0000000..6606073 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSafetyThingsCheckMapper.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 TrafficSafetyThingsCheckMapper { + /** + * 列表 + * @param page + * @return + */ + List datalistPage(Page page); + + void save(PageData pd); +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.java new file mode 100644 index 0000000..9370001 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.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 TrafficSecurityCustomerManagementMapper { + void save(PageData pd); + + /** + * 列表 + * @param page + * @return + */ + List datalistPage(Page page); + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityNoticeMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityNoticeMapper.java index 417c5d2..398c88a 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityNoticeMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityNoticeMapper.java @@ -36,4 +36,5 @@ public interface TrafficSecurityNoticeMapper { List getAllNotifications(PageData pd); + int getRedPoint(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 a4c83fd..4e4dd1f 100644 --- a/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java @@ -10,4 +10,8 @@ public interface TrafficSecurityReadDetailMapper { void save(PageData pd); List datalistPage(Page page); + + public List listByUserId (Page page); + + void edit(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 new file mode 100644 index 0000000..0c4b5fe --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java @@ -0,0 +1,22 @@ +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 TrafficSecurityWaybillRegistrationMapper { + + /** + * 列表 + * @param page + * @return + */ + List datalistPage(Page page); + + void save(PageData pd); + + PageData forSecurityPerson(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyDrivingCommitmenService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyDrivingCommitmenService.java new file mode 100644 index 0000000..f1143bb --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyDrivingCommitmenService.java @@ -0,0 +1,10 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSafetyDrivingCommitmenService { + List listForDrivingCommitmenk(Page page); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyThingsCheckService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyThingsCheckService.java new file mode 100644 index 0000000..791e147 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSafetyThingsCheckService.java @@ -0,0 +1,12 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSafetyThingsCheckService { + List listForThingsCheck(Page page); + + void save(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java new file mode 100644 index 0000000..eee3c70 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityCustomerManagementService.java @@ -0,0 +1,12 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSecurityCustomerManagementService { + void save(PageData pd); + + List listForSecurityCustomerManagement(Page page); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityNoticeService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityNoticeService.java index 015e88c..0f33117 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityNoticeService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityNoticeService.java @@ -21,4 +21,5 @@ public interface TrafficSecurityNoticeService { List getAllNotifications(PageData pd); + public int getRedPoint(PageData pd) throws Exception; } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java index 1b75f42..d4c1534 100644 --- a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java @@ -9,4 +9,8 @@ public interface TrafficSecurityReadDetailService { void save(PageData pd); List getAllReadDetail(Page page)throws Exception; + + List listByUserId(Page page) throws Exception; + + void edit(PageData pd); } diff --git a/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java new file mode 100644 index 0000000..f4c4421 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java @@ -0,0 +1,14 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface TrafficSecurityWaybillRegistrationService { + List listForSecurityNotice(Page page); + + void save(PageData pd); + + PageData forSecurityPerson(PageData pd); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyDrivingCommitmenServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyDrivingCommitmenServiceImpl.java new file mode 100644 index 0000000..9f3b1f9 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyDrivingCommitmenServiceImpl.java @@ -0,0 +1,21 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyDrivingCommitmentMapper; +import com.zcloud.service.comprehensive.TrafficSafetyDrivingCommitmenService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSafetyDrivingCommitmenServiceImpl implements TrafficSafetyDrivingCommitmenService { + + @Autowired + private TrafficSafetyDrivingCommitmentMapper traversalCommitmentMapper; + @Override + public List listForDrivingCommitmenk(Page page) { + return traversalCommitmentMapper.datalistPage(page); + } +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyThingsCheckServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyThingsCheckServiceImpl.java new file mode 100644 index 0000000..c40ea83 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSafetyThingsCheckServiceImpl.java @@ -0,0 +1,25 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSafetyThingsCheckMapper; +import com.zcloud.service.comprehensive.TrafficSafetyThingsCheckService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSafetyThingsCheckServiceImpl implements TrafficSafetyThingsCheckService { + @Autowired + private TrafficSafetyThingsCheckMapper trafficSafetyThingsCheckMapper; + @Override + public List listForThingsCheck(Page page) { + return trafficSafetyThingsCheckMapper.datalistPage(page); + } + + @Override + public void save(PageData pd) { + trafficSafetyThingsCheckMapper.save(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 new file mode 100644 index 0000000..69a4554 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityCustomerManagementServiceImpl.java @@ -0,0 +1,25 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityCustomerManagementMapper; +import com.zcloud.service.comprehensive.TrafficSecurityCustomerManagementService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSecurityCustomerManagementServiceImpl implements TrafficSecurityCustomerManagementService { + @Autowired + private TrafficSecurityCustomerManagementMapper customerManagementMapper; + @Override + public void save(PageData pd) { + customerManagementMapper.save(pd); + } + + @Override + public List listForSecurityCustomerManagement(Page page) { + return customerManagementMapper.datalistPage(page); + } +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityNoticeServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityNoticeServiceImpl.java index 065c291..e617243 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityNoticeServiceImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityNoticeServiceImpl.java @@ -44,6 +44,9 @@ public class TrafficSecurityNoticeServiceImpl implements TrafficSecurityNoticeSe return securityNoticeMapper.getAllNotifications(pd); } - + @Override + public int getRedPoint(PageData pd) throws Exception { + return securityNoticeMapper.getRedPoint(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 a54dcb2..3cbdf4b 100644 --- a/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java @@ -22,4 +22,15 @@ public class TrafficSecurityReadDetailImpl implements TrafficSecurityReadDetailS public List getAllReadDetail(Page page) { return securityReadDetailMapper.datalistPage(page); } + + @Override + public List listByUserId(Page page) throws Exception { + // TODO Auto-generated method stub + return securityReadDetailMapper.listByUserId(page); + } + + @Override + public void edit(PageData pd) { + securityReadDetailMapper.edit(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 new file mode 100644 index 0000000..712322d --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java @@ -0,0 +1,31 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.TrafficSecurityWaybillRegistrationMapper; +import com.zcloud.service.comprehensive.TrafficSecurityWaybillRegistrationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TrafficSecurityWaybillRegistrationServiceImpl implements TrafficSecurityWaybillRegistrationService { + + @Autowired + private TrafficSecurityWaybillRegistrationMapper TrafficSecurityWaybillRegistrationMapper; + @Override + public List listForSecurityNotice(Page page) { + return TrafficSecurityWaybillRegistrationMapper.datalistPage(page); + } + + @Override + public void save(PageData pd) { + TrafficSecurityWaybillRegistrationMapper.save(pd); + } + + @Override + public PageData forSecurityPerson(PageData pd) { + return TrafficSecurityWaybillRegistrationMapper.forSecurityPerson(pd); + } +} diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyDrivingCommitmentMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyDrivingCommitmentMapper.xml new file mode 100644 index 0000000..ad3b8fd --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyDrivingCommitmentMapper.xml @@ -0,0 +1,85 @@ + + + + + + BUS_TRAFFIC_DRIVING_COMMITMENT + + + + + SYS_DICTIONARIES + + + + + f.DRIVINGCOMMITMENT_ID, + f.INQUIRYCONTENT, + f.INQUIRYCONCLUSION, + f.TRANSPORTCOMPANY, + f.TRANSPORTCATEGORY, + f.CREATEYPE, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME + + + + + DRIVINGCOMMITMENT_ID, + INQUIRYCONTENT, + INQUIRYCONCLUSION, + TRANSPORTCOMPANY, + TRANSPORTCATEGORY, + CREATEYPE, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME + + + + + #{DRIVINGCOMMITMENT_ID}, + #{INQUIRYCONTENT}, + #{INQUIRYCONCLUSION}, + #{TRANSPORTCOMPANY}, + #{TRANSPORTCATEGORY}, + #{CREATEYPE}, + #{ISDELETE}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME} + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyThingsCheckMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyThingsCheckMapper.xml new file mode 100644 index 0000000..028eae1 --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyThingsCheckMapper.xml @@ -0,0 +1,97 @@ + + + + + + BUS_TRAFFIC_THINGS_CHECK + + + + + SYS_DICTIONARIES + + + + f.THINGS_CHECK_ID, + f.CHECKITEMNAME, + f.CHECKITEMTYPE, + f.CHECKITEMDESCRIPTION, + f.TRANSPORTCOMPANY, + f.TRANSPORTCATEGORY, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME + + + + + THINGS_CHECK_ID, + CHECKITEMNAME, + CHECKITEMTYPE, + CHECKITEMDESCRIPTION, + TRANSPORTCOMPANY, + TRANSPORTCATEGORY, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME + + + + + #{THINGS_CHECK_ID}, + #{CHECKITEMNAME}, + #{CHECKITEMTYPE}, + #{CHECKITEMDESCRIPTION}, + #{TRANSPORTCOMPANY}, + #{TRANSPORTCATEGORY}, + #{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 new file mode 100644 index 0000000..1439030 --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml @@ -0,0 +1,103 @@ + + + + + BUS_TRAFFIC_CUSTOMER_MANAGEMENT + + + + + SYS_DICTIONARIES + + + + + f.CUSTOMERMANAGEMENT_ID, + f.CUSTOMERTYPE, + f.CUSTOMERNAME, + f.CONTACT, + f.CONTACTPHONE, + f.CUSTOMERADDRESS, + f.TRANSPORTATIONCOMPANY, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME + + + + + CUSTOMERMANAGEMENT_ID, + CUSTOMERTYPE, + CUSTOMERNAME, + CONTACT, + CONTACTPHONE, + CUSTOMERADDRESS, + TRANSPORTATIONCOMPANY, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME + + + + + #{CUSTOMERMANAGEMENT_ID}, + #{CUSTOMERTYPE}, + #{CUSTOMERNAME}, + #{CONTACT}, + #{CONTACTPHONE}, + #{CUSTOMERADDRESS}, + #{TRANSPORTATIONCOMPANY}, + #{ISDELETE}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME} + + + + + insert into + + ( + + ) values ( + + ) + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml index 2f574b1..70e4f3a 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityNoticeMapper.xml @@ -20,6 +20,7 @@ f.REPLY, f.SIGNING, f.TRANSPORTATIONCOMPANY, + f.PERSON_ID, f.PERSON, f.NOTIFICATIONCONTENT, f.ISDELETE, @@ -33,11 +34,11 @@ f.OPERATTIME, f.PRACTITIONER, f.PRACTITIONERTYPE, - f.SIGNEDSTATUS, - f.SIGNEDDATE, - f.REPLYDATE, - f.REPLYCONTENT, - f.CONFIRM_MESSAGE_SIGN_ROUTE, + f.ATTACHMENT_ROUTE, + f.ATTACHMENT_NAME, + f.VIDEO_ROUTE, + f.VIDEO_NAME, + f.REPLYSTATUS, f.POSTSTATUS @@ -49,6 +50,7 @@ REPLY, SIGNING, TRANSPORTATIONCOMPANY, + PERSON_ID, PERSON, NOTIFICATIONCONTENT, ISDELETE, @@ -63,11 +65,10 @@ REPLYSTATUS, PRACTITIONER, PRACTITIONERTYPE, - SIGNEDSTATUS, - SIGNEDDATE, - REPLYDATE, - REPLYCONTENT, - CONFIRM_MESSAGE_SIGN_ROUTE, + ATTACHMENT_ROUTE, + ATTACHMENT_NAME, + VIDEO_ROUTE, + VIDEO_NAME, POSTSTATUS @@ -79,6 +80,7 @@ #{REPLY}, #{SIGNING}, #{TRANSPORTATIONCOMPANY}, + #{PERSON_ID}, #{PERSON}, #{NOTIFICATIONCONTENT}, #{ISDELETE}, @@ -93,11 +95,10 @@ #{REPLYSTATUS}, #{PRACTITIONER}, #{PRACTITIONERTYPE}, - #{SIGNEDSTATUS}, - #{SIGNEDDATE}, - #{REPLYDATE}, - #{REPLYCONTENT}, - #{CONFIRM_MESSAGE_SIGN_ROUTE}, + #{ATTACHMENT_ROUTE}, + #{ATTACHMENT_NAME}, + #{VIDEO_ROUTE}, + #{VIDEO_NAME}, #{POSTSTATUS} @@ -179,4 +180,15 @@ + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml index 9fc5acb..8454c09 100644 --- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml @@ -13,11 +13,12 @@ + f.READDETAIL_ID, f.NOTIFICATION_ID, f.TITLE, f.LEVEL, - f.REPLYSTATUS, - f.SIGNEDSTATUS, + f.REPLY, + f.PERSON_ID, f.PERSON, f.REPLYDATE, f.REPLYCONTENT, @@ -33,15 +34,18 @@ f.OPERATORNAME, f.OPERATTIME, f.PRACTITIONERTYPE, + f.TYPE, f.TRANSPORTATIONCOMPANY + READDETAIL_ID, NOTIFICATION_ID, TITLE, LEVEL, - REPLYSTATUS, + REPLY, + PERSON_ID, PERSON, SIGNEDDATE, REPLYDATE, @@ -56,16 +60,18 @@ OPERATOR, OPERATORNAME, OPERATTIME, - PRACTITIONERTYPE, - SIGNEDSTATUS + TYPE, + PRACTITIONERTYPE + #{READDETAIL_ID}, #{NOTIFICATION_ID}, #{TITLE}, #{LEVEL}, - #{REPLYSTATUS}, + #{REPLY}, + #{PERSON_ID}, #{PERSON}, #{SIGNEDDATE}, #{REPLYDATE}, @@ -80,8 +86,8 @@ #{OPERATOR}, #{OPERATORNAME}, #{OPERATTIME}, - #{PRACTITIONERTYPE}, - #{SIGNEDSTATUS} + #{TYPE}, + #{PRACTITIONERTYPE} @@ -98,14 +104,12 @@ + + + + + + update + + set + SIGNEDDATE=#{SIGNEDDATE} + + , SIGNING=#{SIGNING} + + + , REPLYDATE=#{REPLYDATE} + + + , `TYPE`=#{TYPE} + + + , REPLYCONTENT=#{REPLYCONTENT} + + where NOTIFICATION_ID = #{NOTIFICATION_ID} + and PERSON_ID = #{USER_ID} + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml new file mode 100644 index 0000000..ee13e92 --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml @@ -0,0 +1,161 @@ + + + + + + BUS_TRAFFIC_WAYBILL_REGISTRATION + + + + SYS_DICTIONARIES + + + + f.WAYBILLREGISTRATION_ID, + f.WAYBILLNUMBER, + f.WAYBILLSTATUS, + f.TRANSPORTVEHICLE, + f.CLIENT, + f.CONFIRMER, + f.ORIGIN, + f.DESTINATION, + f.ISDELETE, + f.DELETOR, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME, + f.CLIENTCONTACTPERSON, + f.CLIENTCONTACTPHONE, + f.CONFIRMINGPERSON, + f.DISPATCHER, + f.SHIPPINGDATE, + f.SHIPPINGADDRESS, + f.DESTINATIONADDRESS, + f.STARTADMINISTRATIVEAREA, + f.ENDDMINISTRATIVEAREA, + f.TRUCKCART, + f.EMPLOYEEPHONE, + f.IDENTITYID, + f.TRANSPORTATIONCOMPANY, + f.PRACTITIONERTYPE, + f.PRACTITIONER, + f.CONFIRMINGPHONE + + + + + WAYBILLREGISTRATION_ID, + WAYBILLNUMBER, + WAYBILLSTATUS, + TRANSPORTVEHICLE, + CLIENT, + CONFIRMER, + ORIGIN, + DESTINATION, + ISDELETE, + DELETOR, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME, + CLIENTCONTACTPERSON, + CLIENTCONTACTPHONE, + CONFIRMINGPERSON, + DISPATCHER, + PRACTITIONER, + SHIPPINGDATE, + SHIPPINGADDRESS, + DESTINATIONADDRESS, + STARTADMINISTRATIVEAREA, + ENDDMINISTRATIVEAREA, + TRUCKCART, + EMPLOYEEPHONE, + IDENTITYID, + TRANSPORTATIONCOMPANY, + PRACTITIONERTYPE, + CONFIRMINGPHONE + + + + + #{WAYBILLREGISTRATION_ID}, + #{WAYBILLNUMBER}, + #{WAYBILLSTATUS}, + #{TRANSPORTVEHICLE}, + #{CLIENT}, + #{CONFIRMER}, + #{ORIGIN}, + #{DESTINATION}, + #{ISDELETE}, + #{DELETOR}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME}, + #{CLIENTCONTACTPERSON}, + #{CLIENTCONTACTPHONE}, + #{CONFIRMINGPERSON}, + #{DISPATCHER}, + #{PRACTITIONER}, + #{SHIPPINGDATE}, + #{SHIPPINGADDRESS}, + #{DESTINATIONADDRESS}, + #{STARTADMINISTRATIVEAREA}, + #{ENDDMINISTRATIVEAREA}, + #{TRUCKCART}, + #{EMPLOYEEPHONE}, + #{IDENTITYID}, + #{TRANSPORTATIONCOMPANY}, + #{PRACTITIONERTYPE}, + #{CONFIRMINGPHONE} + + + + + + insert into + + ( + + ) values ( + + ) + + + + + + + +