安全通知->功能优化

运单登记后端功能
客户管理后端功能

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<String,String> map = new HashMap<String,String>();
+        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<String, Object> map = new HashMap<String, Object>();
+        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<String,Object> map = new HashMap<String,Object>();
+        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<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        /*
+         * 1.获取关系信息
+         * 2.根据关系信息找到公告信息
+         */
+        pd.put("USER_ID", Jurisdiction.getUSER_ID());
+        page.setPd(pd);
+        List<PageData> varList = trafficSecurityReadDetailService.listByUserId(page);
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+}

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<PageData> varList = trafficDrivingLogService.listForDrivingLog(page);
         map.put("varList", varList);

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<String, Object> map = new HashMap<String, Object>();
+        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<PageData> varList = trafficSafetyDrivingCommitmenService.listForDrivingCommitmenk(page);
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+}

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<String, Object> map = new HashMap<String, Object>();
+        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<PageData> varList = trafficSafetyThingsCheckService.listForThingsCheck(page);
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+
+}

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<String, Object> map = new HashMap<String, Object>();
+        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<String, Object> map = new HashMap<String, Object>();
+        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<PageData> varList = customerManagementService.listForSecurityCustomerManagement(page);
+        map.put("varList", varList);
+        map.put("page", page);
+        map.put("result", errInfo);
+        return map;
+    }
+}

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<String, Object> map = new HashMap<String, Object>();
         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<PageData> notifications = securityNoticeService.getAllNotifications(pd);
-        Map<String, Integer> 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<String, Object> map = new HashMap<String, Object>();
@@ -120,8 +131,7 @@ public class TrafficSecurityNoticeController extends BaseController {
     public Object listForSecurityNotice(Page page) throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         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<PageData> varList = securityNoticeService.listForSecurityNotice(page); // 列出Hidden列表
+        List<PageData> 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<PageData> 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<String,Object> map = new HashMap<String,Object>();
+        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;
+    }
 }

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<String, Object> map = new HashMap<String, Object>();
+        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<PageData> 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<String, Object> map = new HashMap<String, Object>();
+        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<String, Object> map = new HashMap<String, Object>();
+        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;
+    }
+}

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<PageData> datalistPage(Page page);
+}

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<PageData> datalistPage(Page page);
+
+    void save(PageData pd);
+}

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<PageData> datalistPage(Page page);
+
+}

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityNoticeMapper.java

@@ -36,4 +36,5 @@ public interface TrafficSecurityNoticeMapper {
 
     List<PageData> getAllNotifications(PageData pd);
 
+    int getRedPoint(PageData pd);
 }

src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityReadDetailMapper.java

@@ -10,4 +10,8 @@ public interface TrafficSecurityReadDetailMapper {
     void save(PageData pd);
 
     List<PageData> datalistPage(Page page);
+
+    public List<PageData> listByUserId (Page page);
+
+    void edit(PageData pd);
 }

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<PageData> datalistPage(Page page);
+
+    void save(PageData pd);
+
+    PageData forSecurityPerson(PageData pd);
+}

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<PageData> listForDrivingCommitmenk(Page page);
+}

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<PageData> listForThingsCheck(Page page);
+
+    void save(PageData pd);
+}

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<PageData> listForSecurityCustomerManagement(Page page);
+}

src/main/java/com/zcloud/service/comprehensive/TrafficSecurityNoticeService.java

@@ -21,4 +21,5 @@ public interface TrafficSecurityNoticeService {
 
     List<PageData> getAllNotifications(PageData pd);
 
+    public int getRedPoint(PageData pd) throws Exception;
 }

src/main/java/com/zcloud/service/comprehensive/TrafficSecurityReadDetailService.java

@@ -9,4 +9,8 @@ public interface TrafficSecurityReadDetailService {
     void save(PageData pd);
 
     List<PageData> getAllReadDetail(Page page)throws Exception;
+
+    List<PageData> listByUserId(Page page) throws Exception;
+
+    void edit(PageData pd);
 }

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<PageData> listForSecurityNotice(Page page);
+
+    void save(PageData pd);
+
+    PageData forSecurityPerson(PageData pd);
+}

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<PageData> listForDrivingCommitmenk(Page page) {
+        return traversalCommitmentMapper.datalistPage(page);
+    }
+}

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<PageData> listForThingsCheck(Page page) {
+        return trafficSafetyThingsCheckMapper.datalistPage(page);
+    }
+
+    @Override
+    public void save(PageData pd) {
+        trafficSafetyThingsCheckMapper.save(pd);
+    }
+}

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<PageData> listForSecurityCustomerManagement(Page page) {
+        return customerManagementMapper.datalistPage(page);
+    }
+}

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);
+    }
 
 }

src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityReadDetailImpl.java

@@ -22,4 +22,15 @@ public class TrafficSecurityReadDetailImpl implements TrafficSecurityReadDetailS
     public List<PageData> getAllReadDetail(Page page) {
         return securityReadDetailMapper.datalistPage(page);
     }
+
+    @Override
+    public List<PageData> listByUserId(Page page) throws Exception {
+        // TODO Auto-generated method stub
+        return securityReadDetailMapper.listByUserId(page);
+    }
+
+    @Override
+    public void edit(PageData pd) {
+        securityReadDetailMapper.edit(pd);
+    }
 }

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<PageData> 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);
+    }
+}

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyDrivingCommitmentMapper.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.comprehensive.TrafficSafetyDrivingCommitmentMapper">
+    <!--表名 -->
+    <sql id="tableName">
+        BUS_TRAFFIC_DRIVING_COMMITMENT
+    </sql>
+
+    <!--数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+
+    <!-- 字段 -->
+    <sql id="Field">
+        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
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        DRIVINGCOMMITMENT_ID,
+        INQUIRYCONTENT,
+        INQUIRYCONCLUSION,
+        TRANSPORTCOMPANY,
+        TRANSPORTCATEGORY,
+        CREATEYPE,
+        ISDELETE,
+        DELETOR,
+        DELETORNAME,
+        DELETETIME,
+        CREATOR,
+        CREATORNAME,
+        CREATETIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{DRIVINGCOMMITMENT_ID},
+        #{INQUIRYCONTENT},
+        #{INQUIRYCONCLUSION},
+        #{TRANSPORTCOMPANY},
+        #{TRANSPORTCATEGORY},
+        #{CREATEYPE},
+        #{ISDELETE},
+        #{DELETOR},
+        #{DELETORNAME},
+        #{DELETETIME},
+        #{CREATOR},
+        #{CREATORNAME},
+        #{CREATETIME},
+        #{OPERATOR},
+        #{OPERATORNAME},
+        #{OPERATTIME}
+    </sql>
+
+    <!--列表-->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include> f
+        where f.ISDELETE = '0'
+        <if test="pd.TRANSPORTCOMPANY != null and pd.TRANSPORTCOMPANY != ''"><!-- 关键词检索-运输企业 -->
+            and f.TRANSPORTCOMPANY = #{TRANSPORTCOMPANY}
+        </if>
+    </select>
+</mapper>

src/main/resources/mybatis/datasource/comprehensive/TrafficSafetyThingsCheckMapper.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.comprehensive.TrafficSafetyThingsCheckMapper">
+    <!--表名 -->
+    <sql id="tableName">
+        BUS_TRAFFIC_THINGS_CHECK
+    </sql>
+
+    <!--数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+    <!-- 字段 -->
+    <sql id="Field">
+        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
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        THINGS_CHECK_ID,
+        CHECKITEMNAME,
+        CHECKITEMTYPE,
+        CHECKITEMDESCRIPTION,
+        TRANSPORTCOMPANY,
+        TRANSPORTCATEGORY,
+        ISDELETE,
+        DELETOR,
+        DELETORNAME,
+        DELETETIME,
+        CREATOR,
+        CREATORNAME,
+        CREATETIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{THINGS_CHECK_ID},
+        #{CHECKITEMNAME},
+        #{CHECKITEMTYPE},
+        #{CHECKITEMDESCRIPTION},
+        #{TRANSPORTCOMPANY},
+        #{TRANSPORTCATEGORY},
+        #{ISDELETE},
+        #{DELETOR},
+        #{DELETORNAME},
+        #{DELETETIME},
+        #{CREATOR},
+        #{CREATORNAME},
+        #{CREATETIME},
+        #{OPERATOR},
+        #{OPERATORNAME},
+        #{OPERATTIME}
+    </sql>
+    <!-- 新增-->
+    <insert id="save" parameterType="pd">
+        insert into
+        <include refid="tableName"></include>
+        (
+        <include refid="Field2"></include>
+        ) values (
+        <include refid="FieldValue"></include>
+        )
+    </insert>
+
+    <!--列表-->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include> f
+        where f.ISDELETE = '0'
+        <if test="pd.TRANSPORTCOMPANY != null and pd.TRANSPORTCOMPANY != ''"><!-- 关键词检索-运输企业 -->
+            and f.TRANSPORTCOMPANY = #{TRANSPORTCOMPANY}
+        </if>
+        <if test="pd.CHECKITEMTYPE != null and pd.CHECKITEMTYPE != ''"><!-- 关键词检索-检查项类型 -->
+            and f.CHECKITEMTYPE = #{CHECKITEMTYPE}
+        </if>
+    </select>
+</mapper>

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityCustomerManagementMapper.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.comprehensive.TrafficSecurityCustomerManagementMapper">
+    <sql id="tableName">
+        BUS_TRAFFIC_CUSTOMER_MANAGEMENT
+    </sql>
+
+    <!--数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+
+    <!--字段 -->
+    <sql id="Field">
+        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
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        CUSTOMERMANAGEMENT_ID,
+        CUSTOMERTYPE,
+        CUSTOMERNAME,
+        CONTACT,
+        CONTACTPHONE,
+        CUSTOMERADDRESS,
+        TRANSPORTATIONCOMPANY,
+        ISDELETE,
+        DELETOR,
+        DELETORNAME,
+        DELETETIME,
+        CREATOR,
+        CREATORNAME,
+        CREATETIME,
+        OPERATOR,
+        OPERATORNAME,
+        OPERATTIME
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{CUSTOMERMANAGEMENT_ID},
+        #{CUSTOMERTYPE},
+        #{CUSTOMERNAME},
+        #{CONTACT},
+        #{CONTACTPHONE},
+        #{CUSTOMERADDRESS},
+        #{TRANSPORTATIONCOMPANY},
+        #{ISDELETE},
+        #{DELETOR},
+        #{DELETORNAME},
+        #{DELETETIME},
+        #{CREATOR},
+        #{CREATORNAME},
+        #{CREATETIME},
+        #{OPERATOR},
+        #{OPERATORNAME},
+        #{OPERATTIME}
+    </sql>
+
+    <!-- 新增-->
+    <insert id="save" parameterType="pd">
+        insert into
+        <include refid="tableName"></include>
+        (
+        <include refid="Field2"></include>
+        ) values (
+        <include refid="FieldValue"></include>
+        )
+    </insert>
+
+    <!--列表-->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+        f.*,
+        i.CORP_NAME
+        from
+        <include refid="tableName"></include> f
+        left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
+        where f.ISDELETE = '0'
+        <if test="pd.CUSTOMERTYPE != null and pd.CUSTOMERTYPE != ''"><!-- 关键词检索-客户类型 -->
+            and f.CUSTOMERTYPE = #{pd.CUSTOMERTYPE}
+        </if>
+        <if test="pd.TRANSPORTATIONCOMPANY != null and pd.TRANSPORTATIONCOMPANY != ''"><!-- 关键词检索-运输企业 -->
+            and f.TRANSPORTATIONCOMPANY = #{pd.TRANSPORTATIONCOMPANY}
+        </if>
+    </select>
+</mapper>

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
 	</sql>
 
@@ -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
 	</sql>
 
@@ -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}
 	</sql>
 
@@ -179,4 +180,15 @@
 		</if>
 	</select>
 
+	<select id="getRedPoint" parameterType="pd" resultType="int">
+
+		SELECT
+			count(*)
+		FROM
+			bus_traffic_read_detail u
+				LEFT JOIN bus_traffic_comprehensivemanagement_securitynotice c ON c.NOTIFICATION_ID = u.NOTIFICATION_ID
+		where u.PERSON_ID = #{USER_ID} and c.ISDELETE ='0'
+
+	</select>
+
 </mapper>

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityReadDetailMapper.xml

@@ -13,11 +13,12 @@
 
     <!-- 字段 -->
     <sql id="Field">
+        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
     </sql>
 
     <!-- 字段用于新增 -->
     <sql id="Field2">
+        READDETAIL_ID,
         NOTIFICATION_ID,
         TITLE,
         LEVEL,
-        REPLYSTATUS,
+        REPLY,
+        PERSON_ID,
         PERSON,
         SIGNEDDATE,
         REPLYDATE,
@@ -56,16 +60,18 @@
         OPERATOR,
         OPERATORNAME,
         OPERATTIME,
-        PRACTITIONERTYPE,
-        SIGNEDSTATUS
+        TYPE,
+        PRACTITIONERTYPE
     </sql>
 
     <!-- 字段值 -->
     <sql id="FieldValue">
+        #{READDETAIL_ID},
         #{NOTIFICATION_ID},
         #{TITLE},
         #{LEVEL},
-        #{REPLYSTATUS},
+        #{REPLY},
+        #{PERSON_ID},
         #{PERSON},
         #{SIGNEDDATE},
         #{REPLYDATE},
@@ -80,8 +86,8 @@
         #{OPERATOR},
         #{OPERATORNAME},
         #{OPERATTIME},
-        #{PRACTITIONERTYPE},
-        #{SIGNEDSTATUS}
+        #{TYPE},
+        #{PRACTITIONERTYPE}
     </sql>
 
     <!-- 新增-->
@@ -98,14 +104,12 @@
     <!--列表-->
     <select id="datalistPage" parameterType="page" resultType="pd">
         select
-        <include refid="Field"></include>,
-        d.NAME as practitionerTypeName
+        <include refid="Field"></include>
         from
         <include refid="tableName"></include> f
-        left join <include refid="dicTableName"></include> d on f.PRACTITIONERTYPE = d.PARENT_ID
         where f.ISDELETE = '0'
         <if test="pd.NOTIFICATION_ID != null and pd.NOTIFICATION_ID != ''"><!-- 关键词检索-当前通知-->
-            and f.NOTIFICATION_ID = #{NOTIFICATION_ID}
+            and f.NOTIFICATION_ID = #{pd.NOTIFICATION_ID}
         </if>
         <if test="pd.PERSON != null and pd.PERSON != ''"><!-- 关键词检索-从业人员 -->
             and f.PERSON = #{pd.PERSON}
@@ -113,11 +117,62 @@
         <if test="pd.PRACTITIONERTYPE != null and pd.PRACTITIONERTYPE != ''"><!-- 关键词检索-从业类型 -->
             and f.PRACTITIONERTYPE = #{pd.PRACTITIONERTYPE}
         </if>
-        <if test="pd.REPLYSTATUS != null and pd.REPLYSTATUS != ''"><!-- 关键词检索-回复情况 -->
+        <if test="pd.REPLYSTATUS != null and pd.REPLYSTATUS != ''"><!-- 关键词检索-回复状态 -->
             and f.REPLYSTATUS = #{pd.REPLYSTATUS}
         </if>
-        <if test="pd.SIGNEDSTATUS != null and pd.SIGNEDSTATUS != ''"><!-- 关键词检索-签收情况 -->
+        <if test="pd.SIGNEDSTATUS != null and pd.SIGNEDSTATUS != ''"><!-- 关键词检索-签收状态 -->
             and f.SIGNEDSTATUS = #{pd.SIGNEDSTATUS}
         </if>
     </select>
+
+    <!-- 列表 -->
+    <select id="listByUserId" parameterType="page" resultType="pd">
+        SELECT
+        c.*,
+        u.NOTIFICATIONCONTENT,
+        u.VIDEO_ROUTE,
+        u.ATTACHMENT_ROUTE,
+        u.REPLYSTATUS,
+        u.CREATETIME
+        FROM
+        bus_traffic_read_detail c
+        INNER JOIN bus_traffic_comprehensivemanagement_securitynotice u ON c.NOTIFICATION_ID = u.NOTIFICATION_ID
+        WHERE c.PERSON_ID = #{pd.USER_ID}
+        AND u.ISDELETE = 0
+        <if test="pd.NOTIFICATION_ID != null and pd.NOTIFICATION_ID != ''"><!-- 关键词检索-通知标题 -->
+            and c.NOTIFICATION_ID = #{pd.NOTIFICATION_ID}
+        </if>
+        <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">
+            AND (
+            c.SYNOPSIS LIKE CONCAT('%', #{pd.KEYWORDS}, '%')
+            OR
+            c.CONTENT LIKE CONCAT('%', #{pd.KEYWORDS}, '%')
+            )
+        </if>
+        ORDER BY u.CREATETIME DESC
+    </select>
+
+    <update id="edit" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        SIGNEDDATE=#{SIGNEDDATE}
+        <if test="SIGNING != null and SIGNING != ''">
+            , SIGNING=#{SIGNING}
+        </if>
+        <if test="REPLYDATE != null and REPLYDATE != ''">
+            , REPLYDATE=#{REPLYDATE}
+        </if>
+        <if test="TYPE != null and TYPE != ''">
+            , `TYPE`=#{TYPE}
+        </if>
+        <if test="REPLYCONTENT != null and REPLYCONTENT != ''">
+            , REPLYCONTENT=#{REPLYCONTENT}
+        </if>
+        where NOTIFICATION_ID = #{NOTIFICATION_ID}
+        and PERSON_ID = #{USER_ID}
+    </update>
+
+
+
 </mapper>

src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml

@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.comprehensive.TrafficSecurityWaybillRegistrationMapper">
+    <!--表名 -->
+    <sql id="tableName">
+        BUS_TRAFFIC_WAYBILL_REGISTRATION
+    </sql>
+    <!--数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
+    <!--字段 -->
+    <sql id="Field">
+        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
+    </sql>
+
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        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
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{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}
+    </sql>
+
+
+    <!-- 新增-->
+    <insert id="save" parameterType="pd">
+        insert into
+        <include refid="tableName"></include>
+        (
+        <include refid="Field2"></include>
+        ) values (
+        <include refid="FieldValue"></include>
+        )
+    </insert>
+
+    <!--列表-->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+        f.*,
+        i.CORP_NAME
+        from
+        <include refid="tableName"></include> f
+        left join bus_corp_info i on f.TRANSPORTATIONCOMPANY = i.CORPINFO_ID
+        where f.ISDELETE = '0'
+        <if test="pd.WAYBILLSTATUS != null and pd.WAYBILLSTATUS != ''"><!-- 关键词检索-运单状态 -->
+            and f.WAYBILLSTATUS = #{pd.WAYBILLSTATUS}
+        </if>
+        <if test="pd.TRANSPORTVEHICLE != null and pd.TRANSPORTVEHICLE != ''"><!-- 关键词检索-车辆车牌 -->
+            and f.TRANSPORTVEHICLE = #{pd.TRANSPORTVEHICLE}
+        </if>
+    </select>
+
+    <select id="forSecurityPerson" resultType="com.zcloud.entity.PageData"
+            parameterType="com.zcloud.entity.PageData">
+        select
+            i.CORP_NAME
+        from
+            bus_corp_info i
+        where i.CORPINFO_ID = #{TRANSPORTATIONCOMPANY}
+    </select>
+
+</mapper>