diff --git a/src/main/java/com/zcloud/controller/comprehensive/SecurityNoticeController.java b/src/main/java/com/zcloud/controller/comprehensive/SecurityNoticeController.java new file mode 100644 index 0000000..342ae35 --- /dev/null +++ b/src/main/java/com/zcloud/controller/comprehensive/SecurityNoticeController.java @@ -0,0 +1,158 @@ +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.SecurityNoticeService; +import com.zcloud.service.comprehensive.SecurityReadDetailService; +import com.zcloud.service.system.UsersService; +import com.zcloud.util.DateUtil; +import com.zcloud.util.Jurisdiction; +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.*; + +@Controller +@RequestMapping("/securitynotice") +public class SecurityNoticeController extends BaseController { + + @Autowired + private SecurityNoticeService securityNoticeService; + @Autowired + private SecurityReadDetailService securityReadDetail; + + @Autowired + private UsersService usersService; + //新增 + @RequestMapping(value = "/add") + @ResponseBody + public Object add() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + + String notificationId = this.get32UUID(); + + pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 创建人id + pd.put("CREATORNAME", Jurisdiction.getName()); // 创建人姓名 + 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"); + + 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") + "人"); // 回复情况 + securityNoticeService.save(pd); + + String[] persons = pd.getString("PERSON").split(","); + for (String person : persons) { + pd.put("NOTIFICATION_ID", notificationId); + pd.put("PERSON", person.trim()); + securityReadDetail.save(pd); + } + map.put("result", errInfo); + map.put("pd", pd); + return map; + } + + //阅读情况 + @RequestMapping(value = "/getAllReadDetail") + // @RequiresPermissions("hidden:list") + @ResponseBody + public Object getAllReadDetail(Page page) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String PRACTITIONER = pd.getString("PRACTITIONER"); // 关键词检索条件 + if (Tools.notEmpty(PRACTITIONER)) + pd.put("PRACTITIONER", PRACTITIONER.trim()); + String PRACTITIONERTYPE = pd.getString("PRACTITIONERTYPE"); // 关键词检索条件 + if (Tools.notEmpty(PRACTITIONERTYPE)) + pd.put("PRACTITIONERTYPE", PRACTITIONERTYPE.trim()); + String SIGNEDSTATUS = pd.getString("SIGNEDSTATUS"); // 关键词检索条件 + if (Tools.notEmpty(SIGNEDSTATUS)) + pd.put("SIGNEDSTATUS", SIGNEDSTATUS.trim()); + String REPLYSTATUS = pd.getString("REPLYSTATUS"); // 关键词检索条件 + if (Tools.notEmpty(REPLYSTATUS)) + pd.put("REPLYSTATUS", REPLYSTATUS.trim()); + page.setPd(pd); + List notifications = securityReadDetail.getAllReadDetail(page); + map.put("varList", notifications); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + //列表 + @RequestMapping(value = "/listForSecurityNotice") + // @RequiresPermissions("hidden:list") + @ResponseBody + public Object listForSecurityNotice(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 = securityNoticeService.listForSecurityNotice(page); // 列出Hidden列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + //详情 + @RequestMapping(value="/goEdit") + // @RequiresPermissions("traininginfo:edit") + @ResponseBody + public Object goEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = securityNoticeService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + + /**删除 + * @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; + } +} diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index bc442a2..aa73a55 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -245,7 +245,7 @@ public class LoginController extends BaseController { * 获取用户监管部门id * 等级(0--公司领导,1部门领导,3普通员工) * - * @param userPd + * @param * 监管部门 */ private String superviseDepart(PageData dpd) throws Exception { diff --git a/src/main/java/com/zcloud/entity/comprehensivemanagement/Notification.java b/src/main/java/com/zcloud/entity/comprehensivemanagement/Notification.java new file mode 100644 index 0000000..98eb29c --- /dev/null +++ b/src/main/java/com/zcloud/entity/comprehensivemanagement/Notification.java @@ -0,0 +1,138 @@ +package com.zcloud.entity.comprehensivemanagement; + +import lombok.Data; + +@Data +public class Notification { + + /** + * 通知ID + */ + private String NOTIFICATIONID; + + /** + * 标题 + */ + private String TITLE; + + /** + * 等级 + */ + private String LEVEL; + + /** + * 回复 + */ + private String REPLY; + + /** + * 签名 + */ + private String SIGNING; + + /** + * 运输公司 + */ + private String transportationcompany; + + /** + * 企业下发人 + */ + private String PRESON; + + /** + * 通知内容 + */ + private String NOTIFICATIONCONTENT; + + /** + * 回复状态 + */ + private String REPLYSTATUS; + + /** + * 从业人员 + */ + private String PRACTITIONER; + + /** + * 从业类型 + */ + private String PRACTITIONERTYPE; + + /** + * 签收状态 + */ + private String SIGNEDSTATUS; + + /** + * 签收时间 + */ + private String SIGNEDDATE; + + /** + * 回复时间 + */ + private String REPLYDATE; + + /** + * 回复内容 + */ + private String REPLYCONTENT; + + /** + * 发布状态 + */ + private String POSTSTATUS; + + /** + * 是否删除 + */ + private String ISDELETE; + + /** + * 创建人 + */ + private String CREATOR; + + /** + * 创建人姓名 + */ + private String CREATORNAME; + + /** + * 创建时间 + */ + private String CREATETIME; + + /** + * 修改人id + */ + private String OPERATOR; + + /** + * 修改人姓名 + */ + private String OPERATORNAME; + + /** + * 修改时间 + */ + private String OPERATTIME; + + /** + * 删除人id + */ + private String DELETOR; + + /** + * 删除人姓名 + */ + private String DELETORNAME; + + /** + * 删除时间 + */ + private String DELETETIME; + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/SecurityNoticeMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/SecurityNoticeMapper.java new file mode 100644 index 0000000..a07239f --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/SecurityNoticeMapper.java @@ -0,0 +1,39 @@ +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 SecurityNoticeMapper { + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /** + * 列表 + * @param page + * @return + */ + List datalistPage(Page page); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + PageData findById(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + + List getAllNotifications(PageData pd); + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/comprehensive/SecurityReadDetailMapper.java b/src/main/java/com/zcloud/mapper/datasource/comprehensive/SecurityReadDetailMapper.java new file mode 100644 index 0000000..be5ed01 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/comprehensive/SecurityReadDetailMapper.java @@ -0,0 +1,13 @@ +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; + +public interface SecurityReadDetailMapper { + void save(PageData pd); + + List datalistPage(Page page); +} diff --git a/src/main/java/com/zcloud/service/comprehensive/SecurityNoticeService.java b/src/main/java/com/zcloud/service/comprehensive/SecurityNoticeService.java new file mode 100644 index 0000000..eb67f21 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/SecurityNoticeService.java @@ -0,0 +1,24 @@ +package com.zcloud.service.comprehensive; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +public interface SecurityNoticeService { + + void save(PageData pd); + + List listForSecurityNotice(Page page)throws Exception; + + PageData findById(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + List getAllNotifications(PageData pd); + +} diff --git a/src/main/java/com/zcloud/service/comprehensive/SecurityReadDetailService.java b/src/main/java/com/zcloud/service/comprehensive/SecurityReadDetailService.java new file mode 100644 index 0000000..d32f1ad --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/SecurityReadDetailService.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 SecurityReadDetailService { + void save(PageData pd); + + List getAllReadDetail(Page page)throws Exception; +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/SecurityNoticeServiceImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/SecurityNoticeServiceImpl.java new file mode 100644 index 0000000..cd6185b --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/SecurityNoticeServiceImpl.java @@ -0,0 +1,49 @@ +package com.zcloud.service.comprehensive.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.comprehensive.SecurityNoticeMapper; +import com.zcloud.service.comprehensive.SecurityNoticeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class SecurityNoticeServiceImpl implements SecurityNoticeService { + @Resource + private SecurityNoticeMapper securityNoticeMapper; + @Override + public void save(PageData pd) { + securityNoticeMapper.save(pd); + } + + @Override + public List listForSecurityNotice(Page page) throws Exception { + return securityNoticeMapper.datalistPage(page); + } + + /**通过id获取数据 + * @param pd + */ + @Override + public PageData findById(PageData pd)throws Exception { + return securityNoticeMapper.findById(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + securityNoticeMapper.delete(pd); + } + + @Override + public List getAllNotifications(PageData pd) { + return securityNoticeMapper.getAllNotifications(pd); + } + + + +} diff --git a/src/main/java/com/zcloud/service/comprehensive/impl/SecurityReadDetailImpl.java b/src/main/java/com/zcloud/service/comprehensive/impl/SecurityReadDetailImpl.java new file mode 100644 index 0000000..d0b0042 --- /dev/null +++ b/src/main/java/com/zcloud/service/comprehensive/impl/SecurityReadDetailImpl.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.SecurityReadDetailMapper; +import com.zcloud.service.comprehensive.SecurityReadDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class SecurityReadDetailImpl implements SecurityReadDetailService { + @Autowired + private SecurityReadDetailMapper securityReadDetailMapper; + @Override + public void save(PageData pd) { + securityReadDetailMapper.save(pd); + } + + @Override + public List getAllReadDetail(Page page) { + return securityReadDetailMapper.datalistPage(page); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6ad2c32..fece455 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=integrated_traffic -server.port=8099 +server.port=8093 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://192.168.0.64:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 diff --git a/src/main/resources/mybatis/datasource/comprehensive/SecurityNoticeMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/SecurityNoticeMapper.xml new file mode 100644 index 0000000..e1f2027 --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/SecurityNoticeMapper.xml @@ -0,0 +1,179 @@ + + + + + + + BUS_TRAFFIC_COMPREHENSIVEMANAGEMENT_SECURITYNOTICE + + + + + SYS_DICTIONARIES + + + + + f.NOTIFICATION_ID, + f.TITLE, + f.LEVEL, + f.REPLY, + f.SIGNING, + f.TRANSPORTATIONCOMPANY, + f.PERSON, + f.NOTIFICATIONCONTENT, + f.ISDELETE, + f.DELETOR, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME, + f.PRACTITIONER, + f.PRACTITIONERTYPE, + f.SIGNEDSTATUS, + f.SIGNEDDATE, + f.REPLYDATE, + f.REPLYCONTENT, + f.POSTSTATUS + + + + + NOTIFICATION_ID, + TITLE, + LEVEL, + REPLY, + SIGNING, + TRANSPORTATIONCOMPANY, + PERSON, + NOTIFICATIONCONTENT, + ISDELETE, + DELETOR, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME, + REPLYSTATUS, + PRACTITIONER, + PRACTITIONERTYPE, + SIGNEDSTATUS, + SIGNEDDATE, + REPLYDATE, + REPLYCONTENT, + POSTSTATUS + + + + + #{NOTIFICATION_ID}, + #{TITLE}, + #{LEVEL}, + #{REPLY}, + #{SIGNING}, + #{TRANSPORTATIONCOMPANY}, + #{PERSON}, + #{NOTIFICATIONCONTENT}, + #{ISDELETE}, + #{DELETOR}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME}, + #{REPLYSTATUS}, + #{PRACTITIONER}, + #{PRACTITIONERTYPE}, + #{SIGNEDSTATUS}, + #{SIGNEDDATE}, + #{REPLYDATE}, + #{REPLYCONTENT}, + #{POSTSTATUS} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1', + DELETOR = #{DELETOR}, + DELETETIME = #{DELETETIME} + where + NOTIFICATION_ID = #{NOTIFICATION_ID} + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/comprehensive/SecurityReadDetailMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/SecurityReadDetailMapper.xml new file mode 100644 index 0000000..2877cce --- /dev/null +++ b/src/main/resources/mybatis/datasource/comprehensive/SecurityReadDetailMapper.xml @@ -0,0 +1,118 @@ + + + + + + BUS_TRAFFIC_READ_DETAIL + + + + + SYS_DICTIONARIES + + + + + f.NOTIFICATION_ID, + f.TITLE, + f.LEVEL, + f.REPLYSTATUS, + f.SIGNEDSTATUS, + f.PERSON, + f.REPLYDATE, + f.REPLYCONTENT, + f.SIGNEDDATE, + f.ISDELETE, + f.DELETOR, + f.DELETORNAME, + f.DELETETIME, + f.CREATOR, + f.CREATORNAME, + f.CREATETIME, + f.OPERATOR, + f.OPERATORNAME, + f.OPERATTIME, + f.PRACTITIONERTYPE, + f.TRANSPORTATIONCOMPANY + + + + + NOTIFICATION_ID, + TITLE, + LEVEL, + REPLYSTATUS, + PERSON, + SIGNEDDATE, + REPLYDATE, + REPLYCONTENT, + ISDELETE, + DELETOR, + DELETORNAME, + DELETETIME, + CREATOR, + CREATORNAME, + CREATETIME, + OPERATOR, + OPERATORNAME, + OPERATTIME, + PRACTITIONERTYPE, + SIGNEDSTATUS + + + + + #{NOTIFICATION_ID}, + #{TITLE}, + #{LEVEL}, + #{REPLYSTATUS}, + #{PERSON}, + #{SIGNEDDATE}, + #{REPLYDATE}, + #{REPLYCONTENT}, + #{ISDELETE}, + #{DELETOR}, + #{DELETORNAME}, + #{DELETETIME}, + #{CREATOR}, + #{CREATORNAME}, + #{CREATETIME}, + #{OPERATOR}, + #{OPERATORNAME}, + #{OPERATTIME}, + #{PRACTITIONERTYPE}, + #{SIGNEDSTATUS} + + + + + insert into + + ( + + ) values ( + + ) + + + diff --git a/src/main/resources/mybatis/dsno2/mq/MqErrorMessageLogMapper.xml b/src/main/resources/mybatis/dsno2/mq/MqErrorMessageLogMapper.xml deleted file mode 100644 index 4f16685..0000000 --- a/src/main/resources/mybatis/dsno2/mq/MqErrorMessageLogMapper.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - MQ_MESSAGE_ERROR_LOG - - - - - SYS_DICTIONARIES - - - - - f.MESSAGE_LOG_ID, - f.ERROR_MESSAGE, - f.TIME, - f.TYPE, - f.SOURCE, - f.MESSAGE_ERROR_LOG_ID - - - - - MESSAGE_LOG_ID, - ERROR_MESSAGE, - TIME, - TYPE, - SOURCE, - MESSAGE_ERROR_LOG_ID - - - - - #{MESSAGE_LOG_ID}, - #{ERROR_MESSAGE}, - #{TIME}, - #{TYPE}, - #{SOURCE}, - #{MESSAGE_ERROR_LOG_ID} - - - - - insert into - - ( - - ) values ( - - ) - - - - - update - - set - ISDELETE = '1' - where - MESSAGE_ERROR_LOG_ID = #{MESSAGE_ERROR_LOG_ID} - - - - - update - - set - MESSAGE_LOG_ID = #{MESSAGE_LOG_ID}, - ERROR_MESSAGE = #{ERROR_MESSAGE}, - TIME = #{TIME}, - TYPE = #{TYPE}, - SOURCE = #{SOURCE}, - MESSAGE_ERROR_LOG_ID = MESSAGE_ERROR_LOG_ID - where - MESSAGE_ERROR_LOG_ID = #{MESSAGE_ERROR_LOG_ID} - - - - - - - - - - - - - - update - - set - ISDELETE = '1' - where - MESSAGE_ERROR_LOG_ID in - - #{item} - - - -