各种改

src/main/java/com/ejweb/modules/front/report/bean/FrontReportBean.java

@@ -2,6 +2,7 @@ package com.ejweb.modules.front.report.bean;
 
 import com.ejweb.core.base.BaseBean;
 
+import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
 
@@ -33,9 +34,9 @@ public class FrontReportBean extends BaseBean{
     private String exchangeBeforeUser; //varchar(255) DEFAULT NULL COMMENT '移交/转交前用户id',
     private String exchangeAfterUser; //varchar(255) DEFAULT NULL COMMENT '移交/转交后用户id（只记录最新的移交用户，此处不记录历史）',
     private String createBy;    //创建人
-    private Date createDate;    //创建时间
+    private Timestamp createDate;    //创建时间
     private String updateBy;    //更新人\
-    private Date updateDate;    //更新时间
+    private Timestamp updateDate;    //更新时间
     private List<String> ids;
 
     private String code;// 验证码返回的code
@@ -251,11 +252,11 @@ public class FrontReportBean extends BaseBean{
         this.createBy = createBy;
     }
 
-    public Date getCreateDate() {
+    public Timestamp getCreateDate() {
         return createDate;
     }
 
-    public void setCreateDate(Date createDate) {
+    public void setCreateDate(Timestamp createDate) {
         this.createDate = createDate;
     }
 
@@ -267,11 +268,11 @@ public class FrontReportBean extends BaseBean{
         this.updateBy = updateBy;
     }
 
-    public Date getUpdateDate() {
+    public Timestamp getUpdateDate() {
         return updateDate;
     }
 
-    public void setUpdateDate(Date updateDate) {
+    public void setUpdateDate(Timestamp updateDate) {
         this.updateDate = updateDate;
     }
 

src/main/java/com/ejweb/modules/front/report/service/FrontReportService.java

@@ -7,22 +7,17 @@ import com.ejweb.core.service.CrudService;
 import com.ejweb.core.utils.DateUtils;
 import com.ejweb.core.utils.IdWorker;
 import com.ejweb.modules.front.report.bean.FrontReportBean;
-import com.ejweb.modules.front.report.bean.ReportAttachmentBean;
 import com.ejweb.modules.front.report.dao.FrontReportDao;
 import com.ejweb.modules.front.report.entity.FrontReportEntity;
 import com.ejweb.modules.front.upload.util.ReportAttachmentUtils;
-import com.ejweb.modules.reportAttachment.dao.ReportAttachmentMapper;
-import com.ejweb.modules.reportAttachment.entity.ReportAttachment;
 import com.ejweb.modules.sys.entity.User;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
 
-
 /**
  * Created by lenovo on 2017/9/8.
  */
@@ -30,12 +25,12 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class FrontReportService extends CrudService<FrontReportDao,FrontReportEntity>{
-
     // 添加举报信息
     @Transactional(readOnly = false)
     public ResponseBean addReport(FrontReportBean bean){
         ResponseBean responseBean = new ResponseBean();
-        bean.setId(IdWorker.getNextId("R"));
+        String reportId = IdWorker.getNextId("R");
+        bean.setId(reportId);
         Date date = new Date();
         bean.setReportTime(DateUtils.formatDate(date,"yyyy-MM-dd HH:mm:ss"));
 
@@ -48,17 +43,23 @@ public class FrontReportService extends CrudService<FrontReportDao,FrontReportEn
         }
         bean.setCreateBy(user.getId());
         bean.setUpdateBy(user.getId());
-        bean.setCreateDate(date);
-        bean.setUpdateDate(date);
+        Timestamp d = new Timestamp(System.currentTimeMillis());
+        bean.setCreateDate(d);
+        bean.setUpdateDate(d);
         //
        // bean.setExchangeBeforeUser("");
         // 添加举报信息表
-        int row = dao.insertReport(bean);
+        int row = 0;
+        try {
+            row = dao.insertReport(bean);
+        }catch (Exception e){
+            row = dao.insertReport(bean);
+        }
         if(row == 1){ // 添加成功
             List<String> attachmentIds = bean.getIds();
             if(attachmentIds != null && attachmentIds.size() > 0){ // 添加举报附件
                 for(String attachmentId:attachmentIds){
-                    ReportAttachmentUtils.addReportId(attachmentId,bean.getId());
+                    ReportAttachmentUtils.addReportId(attachmentId,reportId);
                 }
             }
 

src/main/java/com/ejweb/modules/front/sso/api/SsoController.java

@@ -17,7 +17,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by zhangzn on 2017/09/13.
@@ -41,18 +43,28 @@ public class SsoController extends BaseController {
             LtpaTokenManager.loadConfig(URLDecoder.decode(URLDecoder.decode(filePath)));
             token = URLDecoder.decode(token);
             token = URLDecoder.decode(token);
+            token = URLDecoder.decode(token);
             String username = "";
-            if (LtpaTokenManager.isValid(token)) {//验证Token是否合法有效
+            boolean result = LtpaTokenManager.isValid(token);
+            if (result) {//验证Token是否合法有效
                 logger.debug(".................合法token：\t\t" + token);
                 LtpaToken ltpaToken = new LtpaToken(token);
                 username = ltpaToken.getUsername();
+                response.setStatus(ErrorCode.STATUS_CODE_2000);
+                response.setMessage("解析用户名正常");
+            }else {
+                response.setStatus(ErrorCode.STATUS_CODE_4105);
+                response.setMessage("token已过期");
             }
-            response.setStatus(ErrorCode.STATUS_CODE_2000);
-            response.setMessage("解析用户名正常");
+            Map<String,String> map = new HashMap<String,String>();
             if (ssoService.checkSso(username) == 1) {
-                response.setData(GConstants.YES);
+                map.put("token",token);
+                map.put("result",GConstants.YES);
+                response.setData(map);
             } else {
-                response.setData(GConstants.NO);
+                map.put("token",token);
+                map.put("result",GConstants.NO);
+                response.setData(map);
             }
         } catch (Exception e) {
             logger.error("解析用户名出错：\n" + e.getMessage());

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

@@ -303,6 +303,23 @@ public class ReportController extends BaseController {
 
     @RequestMapping(value = "export", method = RequestMethod.POST)
     public String export(ReportEntity reportEntity,String flag, HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes) {
+        //判断登录人的角色
+        User user = UserUtils.getUser();
+        if (!reportService.checkRole(user)){
+            reportEntity.setExchangeAfterUser(user.getId());
+        }
+        //判断标签状态 flag为空，跳转到核查中举报列表 flag为0，跳转到未处理举报列表 flag为1，跳转到举报列表
+        if (StringUtils.isNotBlank(flag)){
+            if (flag.equals("0")){
+                if (StringUtils.isBlank(reportEntity.getReportStatus())) {
+                    reportEntity.setReportStatus("0");
+                }
+            }
+        }else{
+            if (StringUtils.isBlank(reportEntity.getReportStatus())) {
+                reportEntity.setReportStatus("1");
+            }
+        }
         try {
             String fileName = "举报列表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
             List<ReportEntity> reportList = reportService.getReportList(reportEntity);

src/main/java/com/ejweb/modules/workbench/Bean/WorkbenchBean.java

@@ -39,6 +39,7 @@ public class WorkbenchBean {
     private int email = 0;
     private int sunacE = 0;
     private int phone = 0;
+    private int visit = 0;
 
     //举报类型
     private int sale = 0;
@@ -196,6 +197,14 @@ public class WorkbenchBean {
         this.phone = phone;
     }
 
+    public int getVisit() {
+        return visit;
+    }
+
+    public void setVisit(int visit) {
+        this.visit = visit;
+    }
+
     public int getSale() {
         return sale;
     }

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

@@ -117,7 +117,7 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
                 }else if("wechat".equals(String.valueOf(total.get("REPORT_SOURCE")))){
                     //微信公众号
                     workbench.setWeChat(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
-                }else if("sunacE:".equals(String.valueOf(total.get("REPORT_SOURCE")))){
+                }else if("sunacE".equals(String.valueOf(total.get("REPORT_SOURCE")))){
                     //融E
                     workbench.setSunacE(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
                 }else if("offline".equals(String.valueOf(total.get("REPORT_SOURCE")))){
@@ -126,14 +126,17 @@ public class WorkbenchService extends CrudService<ReportDao, ReportEntity> {
                 }else if("tel".equals(String.valueOf(total.get("REPORT_SOURCE")))){
                     //电话
                     workbench.setPhone(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
-                }else if("email:".equals((String) total.get("REPORT_SOURCE"))){
+                }else if("email".equals((String) total.get("REPORT_SOURCE"))){
                     //邮件
                     workbench.setEmail(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
+                }else if("visit".equals((String) total.get("REPORT_SOURCE"))){
+                    //来访
+                    workbench.setVisit(Integer.valueOf(String.valueOf(total.get("COUNT(REPORT_SOURCE)"))));
                 }
             }
         }
         workbench.setTotal(workbench.getWeb()+workbench.getOa()+workbench.getSupplier()+workbench.getWeChat()+
-                workbench.getSunacE()+workbench.getOffline()+workbench.getPhone()+workbench.getEmail());
+                workbench.getSunacE()+workbench.getOffline()+workbench.getPhone()+workbench.getEmail()+workbench.getVisit());
         return workbench;
     }
 

src/main/webapp/WEB-INF/views/modules/workbench/workbench.jsp

@@ -258,7 +258,6 @@
                         <td style="width: 10% "></td>
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;供应商系统&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.supplier}</td>
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;邮件&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${workbench.email}</td>
-                        <td></td>
                     </tr>
                 </table>
             </div>