Commit fd891241 by Java-刘铮

ReportController:修改发送消息方法。

reportDetaol:添加dealResult=4为“举报属实”。
reportTrack:修改举报属性个状态可见“是否完成”。
parent acbb25ef
......@@ -9,12 +9,14 @@
<module name="ejweb-manage" />
<module name="it-faq-manage" />
<module name="report_sunac" />
<module name="report_sunac (1)" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="ejweb-manage" target="1.8" />
<module name="it-faq-manage" target="1.8" />
<module name="report_sunac" target="1.8" />
<module name="report_sunac (1)" target="1.8" />
</bytecodeTargetLevel>
</component>
</project>
\ No newline at end of file
......@@ -2,5 +2,6 @@
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$" charset="UTF-8" />
<file url="file://E:/sunac_report" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
......@@ -2,11 +2,14 @@
<project version="4">
<component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" />
<file type="web" url="file://E:/sunac_report" />
</component>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
<option value="E:/gzb_bbhz/pom.xml" />
<option value="E:/sunac_report/pom.xml" />
</list>
</option>
</component>
......
......@@ -3,6 +3,7 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/report_sunac.iml" filepath="$PROJECT_DIR$/report_sunac.iml" />
<module fileurl="file://E:/sunac_report/report_sunac (1).iml" filepath="E:/sunac_report/report_sunac (1).iml" />
</modules>
</component>
</project>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -63,7 +63,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES>
<root url="jar://D:/Java/JDK/jdk1.8.0_131/lib/jconsole.jar!/" />
<root url="jar://D:/java/lib/jconsole.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......@@ -72,7 +72,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES>
<root url="jar://D:/Java/JDK/jdk1.8.0_131/lib/tools.jar!/" />
<root url="jar://D:/java/lib/tools.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
......@@ -50,9 +50,9 @@ public class FrontReportController {
ResponseBean responseBean = new ResponseBean();
if(bean!=null){
if(!CaptchaUtil.validate(bean.getCaptcha(),bean.getCode())){
responseBean.setStatus(ErrorCode.CAPTCHA_ERROR);
responseBean.setMessage("captcha is incorrect");
return responseBean;
responseBean.setStatus(ErrorCode.CAPTCHA_ERROR);
responseBean.setMessage("captcha is incorrect");
return responseBean;
}
if (StringUtils.isBlank(bean.getReportSource())){
responseBean.setStatus(ErrorCode.STATUS_CODE_4002);
......
......@@ -205,4 +205,11 @@ public interface ReportDao extends CrudDao<ReportEntity> {
* 总数
*/
public int getTotalNum(WorkbenchBean bean);
/**
* 删除举报信息
* @param reportEntity
* @return
*/
public int deleteConclusion(ReportEntity reportEntity);
}
......@@ -108,7 +108,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public void setReportTime(String reportTime) {
this.reportTime = reportTime;
}
@ExcelField(title = "举报内容",align = 2,sort = 44)
public String getReportContent() {
return reportContent;
}
......@@ -219,7 +219,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
public void setSupplementProject(String supplementProject) {
this.supplementProject = supplementProject;
}
@ExcelField(title = "举报信息补充内容",align = 2,sort = 46)
public String getSupplementContent() {
return supplementContent;
}
......@@ -335,7 +335,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.transferName = transferName;
}
@ExcelField(title="IP来源", align=2, sort=44)
@ExcelField(title="IP来源", align=2, sort=48)
public String getReportIp() {
return reportIp;
}
......@@ -344,7 +344,7 @@ public class ReportEntity extends DataEntity<ReportEntity> {
this.reportIp = reportIp;
}
@ExcelField(title="IP所属城市", align=2, sort=46)
@ExcelField(title="IP所属城市", align=2, sort=50)
public String getIpCity() {
return ipCity;
}
......
......@@ -563,4 +563,14 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
return reportDao.updateConclusion(reportEntity);
}
/**
* 删除举报信息
*
* @return
*/
@Transactional(readOnly = false)
public int deleteConclusion(ReportEntity reportEntity) {
return reportDao.deleteConclusion(reportEntity);
}
}
......@@ -560,5 +560,18 @@ public class ReportController extends BaseController {
return "redirect:" + adminPath + "/report/list/?repage&flag=0";
}
/**
* 删除举报记录
*
* @return
*/
@RequestMapping(value = "deleteconclusion")
public String deleteConclusion(String id) {
ReportEntity reportEntity = new ReportEntity();
reportEntity.setId(id);
reportService.deleteConclusion(reportEntity);
return "redirect:" + adminPath + "/report/list/?repage&flag=0";
}
}
......@@ -618,4 +618,9 @@
<if test="dbName == 'mysql'"> AND DATE(create_date) &lt;= #{endDate}</if>
</if>
</select>
<delete id="deleteConclusion" >
delete from ct_bbtc_report
where id = #{id}
</delete>
</mapper>
\ No newline at end of file
Manifest-Version: 1.0
Built-By: Dell
Built-By: dell1
Created-By: IntelliJ IDEA
Build-Jdk: 1.8.0_131
Build-Jdk: 1.8.0_121
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment