消息列表 序号顺序排列

记录是否发送邮件

src/main/java/com/ejweb/core/web/CKFinderConnectorServlet.java

@@ -57,14 +57,14 @@ public class CKFinderConnectorServlet extends ConnectorServlet {
                     if (ss.length==2){
                         String realPath = GConstants.getUserfilesBaseDir() + GConstants.USERFILES_BASE_URL
                                 + "/"+principal + "/" + ss[0] + ss[1];
-                        FileUtils.createDirectory(FileUtils.path(realPath));
+//                        FileUtils.createDirectory(FileUtils.path(realPath));
                         
 //                        String realPath = GConstants.getUserfilesBaseDir() + "/" + ss[0] + ss[1];
-//                        realPath= FileManipulation.validateFile(realPath);
-//                        File fileRealPath = new File(FileManipulation.validateFile(realPath));
-//                        if(fileRealPath.exists() == false){
-//                            fileRealPath.mkdirs();
-//                        }
+                        realPath= FileManipulation.validateFile(realPath);
+                        File fileRealPath = new File(FileManipulation.validateFile(realPath));
+                        if(fileRealPath.exists() == false){
+                            fileRealPath.mkdirs();
+                        }
                     }
                 }
             } else if ("QuickUpload".equals(command) && type != null){// 快捷上传，自动创建当前文件夹，并上传到该路径

src/main/java/com/ejweb/modules/report/dao/ReportDao.java

@@ -166,4 +166,10 @@ public interface ReportDao extends CrudDao<ReportEntity> {
      * @return
      */
     public String findExchangeUser(String id);
+
+    /**
+     * 记录发邮件
+     * @return
+     */
+    public int updateIsSendEmail(String reportId);
 }

src/main/java/com/ejweb/modules/report/entity/ReportEntity.java

@@ -44,6 +44,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     private String oaname;//当前用户名
     private String reportIp;    //记录ip地址
     private String ipCity;    //ip地址对应城市
+    private String isSendEmail;    //是否已经发送过邮件 0未发送 1已发送
 
     private String transferName;    //移交给
 
@@ -320,7 +321,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.transferName = transferName;
     }
 
-    @ExcelField(title="IP", align=2, sort=44)
+    @ExcelField(title="IP来源", align=2, sort=44)
     public String getReportIp() {
         return reportIp;
     }
@@ -329,7 +330,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
         this.reportIp = reportIp;
     }
 
-    @ExcelField(title="对应城市", align=2, sort=46)
+    @ExcelField(title="IP所属城市", align=2, sort=46)
     public String getIpCity() {
         return ipCity;
     }
@@ -337,4 +338,13 @@ public class ReportEntity extends DataEntity<ReportEntity> {
     public void setIpCity(String ipCity) {
         this.ipCity = ipCity;
     }
+
+    @ExcelField(title="邮件发送", align=2, sort=48)
+    public String getIsSendEmail() {
+        return isSendEmail;
+    }
+
+    public void setIsSendEmail(String isSendEmail) {
+        this.isSendEmail = isSendEmail;
+    }
 }

src/main/java/com/ejweb/modules/report/service/ReportService.java

@@ -445,6 +445,15 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
             }
             report.setReportIp(report.getReportIp() == null?"--":report.getReportIp());
             report.setIpCity(report.getIpCity() == null?"--":report.getIpCity());
+            String isSendEmail = report.getIsSendEmail();
+            if (StringUtils.isNotBlank(isSendEmail)){
+                if (isSendEmail.equals("1")){
+                    isSendEmail = "是";
+                }
+            }else {
+                isSendEmail = "否";
+            }
+            report.setIsSendEmail(isSendEmail);
         }
         return reportList;
     }
@@ -461,7 +470,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
     }
 
     /**
-     * 查询举报列表
+     * 转交举报
      * @param reportIds
      * @param userId
      * @return
@@ -506,4 +515,13 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
         return reportDao.findExchangeUser(id);
     }
 
+    /**
+     * 记录发邮件
+     * @param reportId
+     * @return
+     */
+    @Transactional(readOnly = false)
+    public int updateIsSendEmail(String reportId) {
+        return reportDao.updateIsSendEmail(reportId);
+    }
 }

src/main/java/com/ejweb/modules/report/web/ReportController.java

@@ -501,4 +501,13 @@ public class ReportController extends BaseController {
         out.close();
     }
 
+    @RequestMapping("recordEmail")
+    public void recordEmail(String reportId, HttpServletResponse response) throws IOException {
+        int result = reportService.updateIsSendEmail(reportId);
+        PrintWriter out = response.getWriter();
+        response.setContentType("application/json;charset=utf-8");
+        out.write(result);
+        out.close();
+    }
+
 }

src/main/java/com/ejweb/modules/report/web/ReportToWordController.java

@@ -114,11 +114,22 @@ public class ReportToWordController {
         reportTime.getCell(1).setText(reportEntity.getReportTime()==null?"":reportEntity.getReportTime());
 
         XWPFTableRow reportIp = basicInfoTable.createRow();
-        reportIp.getCell(0).setText("IP：");
+        reportIp.getCell(0).setText("IP来源：");
         reportIp.getCell(1).setText(reportEntity.getReportIp()==null?"":reportEntity.getReportIp());
         XWPFTableRow ipCity = basicInfoTable.createRow();
-        ipCity.getCell(0).setText("对应城市：");
+        ipCity.getCell(0).setText("IP所属城市：");
         ipCity.getCell(1).setText(reportEntity.getIpCity()==null?"":reportEntity.getIpCity());
+        String is_send_email = reportEntity.getIsSendEmail();
+        if (StringUtils.isNotBlank(is_send_email)){
+            if (is_send_email.equals("1")){
+                is_send_email = "是";
+            }
+        }else {
+            is_send_email = "否";
+        }
+        XWPFTableRow isSendEmail = basicInfoTable.createRow();
+        isSendEmail.getCell(0).setText("是否已发送邮件：");
+        isSendEmail.getCell(1).setText(is_send_email);
 
         //表格第五行
         XWPFTableRow reportContent = basicInfoTable.createRow();

src/main/java/com/ejweb/modules/workbench/dao/ReportNoticeDao.java

+package com.ejweb.modules.workbench.dao;
+
+import com.ejweb.core.persistence.CrudDao;
+import com.ejweb.core.persistence.annotation.MyBatisDao;
+import com.ejweb.modules.workbench.entity.ReportNoticeEntity;
+
+@MyBatisDao
+public interface ReportNoticeDao extends CrudDao<ReportNoticeEntity> {
+}

src/main/java/com/ejweb/modules/workbench/entity/ReportNoticeEntity.java

+package com.ejweb.modules.workbench.entity;
+
+import com.ejweb.core.persistence.DataEntity;
+
+public class ReportNoticeEntity extends DataEntity<ReportNoticeEntity> {
+
+    private static final long serialVersionUID = 1L;
+
+    private String reportId;
+
+    private String title;
+
+    private String sendTime;
+
+    private String sendFromId;
+
+    private String sendToId;
+
+    private String status;
+
+    public String getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(String reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getSendTime() {
+        return sendTime;
+    }
+
+    public void setSendTime(String sendTime) {
+        this.sendTime = sendTime;
+    }
+
+    public String getSendFromId() {
+        return sendFromId;
+    }
+
+    public void setSendFromId(String sendFromId) {
+        this.sendFromId = sendFromId;
+    }
+
+    public String getSendToId() {
+        return sendToId;
+    }
+
+    public void setSendToId(String sendToId) {
+        this.sendToId = sendToId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

src/main/java/com/ejweb/modules/workbench/service/NoticeService.java

@@ -4,8 +4,10 @@ import com.ejweb.core.persistence.Page;
 import com.ejweb.core.service.CrudService;
 import com.ejweb.modules.sys.entity.User;
 import com.ejweb.modules.sys.utils.UserUtils;
+import com.ejweb.modules.workbench.dao.ReportNoticeDao;
 import com.ejweb.modules.workbench.dao.ReportNoticeMapper;
 import com.ejweb.modules.workbench.entity.ReportNotice;
+import com.ejweb.modules.workbench.entity.ReportNoticeEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,10 +17,12 @@ import java.util.List;
  * Created by mengxy on 2017/9/15.
  */
 @Service
-public class NoticeService{
+public class NoticeService extends CrudService<ReportNoticeDao, ReportNoticeEntity>{
 
     @Autowired
     private ReportNoticeMapper noticeMapper;
+    @Autowired
+    private ReportNoticeDao reportNoticeDao;
 
     /**
      * 获取列表

src/main/java/com/ejweb/modules/workbench/web/NoticeController.java

@@ -6,6 +6,7 @@ import com.ejweb.modules.report.service.ReportService;
 import com.ejweb.modules.sys.entity.User;
 import com.ejweb.modules.sys.utils.UserUtils;
 import com.ejweb.modules.workbench.entity.ReportNotice;
+import com.ejweb.modules.workbench.entity.ReportNoticeEntity;
 import com.ejweb.modules.workbench.service.NoticeService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -47,10 +48,13 @@ public class NoticeController extends BaseController {
                     }else {
                         isAdmin = "N";
                     }
-                    Page<ReportNotice> noticePage = noticeService.selectBySendToId(new Page<ReportNotice>(request, response),new ReportNotice(),user.getId());
+//                    Page<ReportNotice> noticePage = noticeService.selectBySendToId(new Page<ReportNotice>(request, response),new ReportNotice(),user.getId());
+                    ReportNoticeEntity reportNoticeEntity = new ReportNoticeEntity();
+                    reportNoticeEntity.setSendToId(user.getId());
+                    Page<ReportNoticeEntity> noticePage = noticeService.findPage(new Page<ReportNoticeEntity>(request, response),reportNoticeEntity);
                     int i = 0;
                     String idArray = "";
-                    for(ReportNotice notice:noticePage.getList()) {
+                    for(ReportNoticeEntity notice:noticePage.getList()) {
                         if("0".equals(notice.getStatus())){
                             if (i == 0) {
                                 idArray += notice.getId();

src/main/resources/mappings/modules/report/ReportDao.xml

@@ -32,7 +32,8 @@
         r.update_date AS "updateDate",
         r.oa_name AS "oaname",
         r.report_ip AS "reportIp",
-        r.ip_city AS "ipCity"
+        r.ip_city AS "ipCity",
+        r.is_send_email AS "isSendEmail"
 
     </sql>
 
@@ -583,8 +584,14 @@
         update_date = #{updateDate}
         WHERE id = #{id}
     </update>
+
     <select id="findExchangeUser" resultType="String">
         SELECT c.EXCHANGE_AFTER_USER FROM CT_BBTC_REPORT c WHERE c.ID = #{id}
     </select>
 
+    <update id="updateIsSendEmail">
+        UPDATE ct_bbtc_report SET
+        is_send_email = '1'
+        WHERE id = #{reportId}
+    </update>
 </mapper>
\ No newline at end of file

src/main/resources/mappings/modules/workbench/ReportNoticeDao.xml

+<?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.ejweb.modules.workbench.dao.ReportNoticeDao">
+
+    <select id="findList" parameterType="ReportNoticeEntity" resultType="ReportNoticeEntity">
+        SELECT
+        c.*, CU."NAME"
+        FROM
+        CT_BBTC_REPORT_NOTICE c
+        LEFT JOIN CT_BBTC_SYS_USER cu ON c.send_to_id = cu.id
+        WHERE c.send_to_id = #{sendToId}
+        ORDER BY
+        c.send_time DESC
+    </select>
+
+
+</mapper>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/report/reportDetail.jsp

@@ -6,6 +6,7 @@
     <meta name="decorator" content="default"/>
     <script type="text/javascript">
         $(document).ready(function () {
+            alert($("#prompt"));
             $("input[type='text']").attr("disabled",true);
 
             $("#btnTrack").click(function () {
@@ -43,6 +44,7 @@
                 dealResult = "举报受理";
             }
             $("#dealResult").val(dealResult);
+            alert($('#default', window.parent.document).html());
         });
         var requestFlag = true;
         function openDownloadDialog(id){
@@ -116,18 +118,24 @@
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label">IP:</label>
+        <label class="control-label">IP来源:</label>
         <div class="controls">
             <form:input path="reportIp" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label">对应城市:</label>
+        <label class="control-label">IP所属城市:</label>
         <div class="controls">
             <form:input path="ipCity" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
         </div>
     </div>
     <div class="control-group">
+        <label class="control-label">是否已发送邮件:</label>
+        <div class="controls">
+            <form:input path="isSendEmail" htmlEscape="false" maxlength="200" class="input-xlarge required"/>
+        </div>
+    </div>
+    <div class="control-group">
         <label class="control-label">内容:</label>
         <div class="controls">
             <form:textarea id="reportContent" htmlEscape="true" style="width:90%" path="reportContent" rows="6" maxlength="500" class="input-xxlarge" disabled="true"/>

src/main/webapp/WEB-INF/views/modules/report/reportList.jsp

@@ -27,6 +27,7 @@
                 var flag = $("#flag").val();
                 window.location.href = "${ctx}/report/list?flag="+flag;
             });
+            //序号连续
             var i = 1;
             var pageNo = $("#pageNo").val();
             var pageSize = $("#pageSize").val();
@@ -143,8 +144,9 @@
                 <c:if test="${isAdmin eq true}">
                     <th>移交给</th>
                 </c:if>
-                <th>IP</th>
-                <th>对应城市</th>
+                <th>IP来源</th>
+                <th>IP所属城市</th>
+                <th>邮件发送</th>
                 <th>操作</th>
             </tr>
         </thead>
@@ -210,6 +212,10 @@
                     <td>${report.reportIp}</td>
                     <td>${report.ipCity}</td>
                     <td>
+                        <c:if test="${report.isSendEmail eq '1'}">是</c:if>
+                        <c:if test="${report.isSendEmail eq null}">否</c:if>
+                    </td>
+                    <td>
                         <a href="${ctx}/report/view?id=${report.id}">查看</a>
                         <c:if test="${report.reportStatus ne '2'}"><a href="${ctx}/report/track?id=${report.id}">跟踪</a></c:if>
                         <a href="#" onclick="openDownloadDialog('${report.id}')">转为文档</a>

src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp

@@ -238,6 +238,18 @@
         })(window);
         var userBrowser = Browser.client.name;
         console.log(userBrowser);
+        function recordEmail() {
+            //记录已发送邮件
+            var reportId = $("#reportId").val();
+            $.ajax({
+                url: "${ctx}/report/recordEmail?reportId="+reportId,
+                dataType: "text",
+                success: function(result) { //登录成功后返回的数据
+                    console.log(result);
+                }
+            });
+            send();
+        }
         //发邮件
         function send(){
             var supplementType = $("#supplementType").find("option:selected").text();
@@ -254,8 +266,15 @@
             path1 += "被举报人:${report.supplementInformant}%0D%0A";
             path1 += "举报时间:${report.reportTime}%0D%0A";
             path1 += "所在城市:${report.reportCity}%0D%0A";
-            path1 += "IP:${report.reportIp}%0D%0A";
-            path1 += "对应城市:${report.ipCity}%0D%0A";
+            path1 += "IP来源:${report.reportIp}%0D%0A";
+            path1 += "IP所属城市:${report.ipCity}%0D%0A";
+            var isSendEmail = "${report.isSendEmail}";
+            if (isSendEmail == '1'){
+                isSendEmail = "是";
+            }else{
+                isSendEmail = "否";
+            }
+            path1 += "是否已发送邮件:"+isSendEmail+"%0D%0A";
             var reportContent = $("#reportContent").val();
             path1 += "内容:";
             var path2 = "%0D%0A附件:%0D%0A";
@@ -333,7 +352,9 @@
                     path = path1 + path2 + path3;
                     pathLength = path.replace(/[^\x00-\xff]/g, "*********").length;
                     alert("填写信息过长,请手动补充缺少的举报内容。推荐使用IE浏览器");
-                    console.log(path);
+                    if (pathLength > 1000){
+                        path = path1 + path2;
+                    }
                 }
             }else if (userBrowser == "IE") {
                 pathLength = path.replace(/[^\x00-\xff]/g, "*").length;
@@ -353,9 +374,10 @@
 ////                    path = path1+path2+path3;
 ////                }
 //            }
-
+            console.log(path);
             console.log(pathLength);
-            window.location.href = path;
+//            window.location.href = path;
+            $("#sendE").attr("href",path);
         }
 
     </script>
@@ -401,7 +423,7 @@
 <br/>
     <form:form id="inputForm" modelAttribute="report" action="${ctx}/report/addTrack" method="post" class="form-horizontal">
 
-    <form:hidden path="id"/>
+    <form:hidden id="reportId" path="id"/>
     <sys:message content="${message}"/>
     <div id="attachment1" style="display: none">
         <c:if test="${supplementAttachmentList ne null}">
@@ -443,18 +465,24 @@
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label">IP:</label>
+        <label class="control-label">IP来源:</label>
         <div class="controls">
             <form:input path="reportIp" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label">对应城市:</label>
+        <label class="control-label">IP所属城市:</label>
         <div class="controls">
             <form:input path="ipCity" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
         </div>
     </div>
     <div class="control-group">
+        <label class="control-label">是否已发送邮件:</label>
+        <div class="controls">
+            <form:input path="isSendEmail" htmlEscape="false" maxlength="200" disabled="true" class="input-xlarge required"/>
+        </div>
+    </div>
+    <div class="control-group">
         <label class="control-label">内容:</label>
         <div class="controls">
             <form:textarea id="reportContent" htmlEscape="true" style="width:90%" path="reportContent" rows="6" maxlength="500" class="input-xxlarge" disabled="true"/>
@@ -584,8 +612,8 @@
     </div>
     <div class="form-actions">
         <input id="btnSubmit" class="btn btn-primary" type="submit" value="提交"/>&nbsp;
-        <input id="btnMail" class="btn btn-primary" type="button" value="发邮件" onclick="send()"/>
-        <%--<a href="#" id="sendE" class="btn btn-primary">发邮件</a>--%>
+        <%--<input id="btnMail" class="btn btn-primary" type="button" value="发邮件" onclick="recordEmail()"/>--%>
+        <a href="#" id="sendE" class="btn btn-primary" onclick="recordEmail()">发邮件</a>
     </div>
     </form:form>
     <div id="fade" class="black_overlay"></div>