From 79bc386be5c29e428eb735907fa4e49952c6e45a Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Wed, 10 Apr 2024 10:49:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=8D=E6=9D=82=E6=A1=88?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apis/reportcase/ReportCaseController.java | 32 ++ .../dao/reportcase/IReportCaseDao.java | 2 - .../pojo/dtos/reportcase/ReportCaseDTO.java | 2 +- .../reportcase/IReportCaseService.java | 3 + .../impl/ReportCaseServiceImpl.java | 18 + .../impl/UserPointsServiceImpl.java | 1 - src/main/resources/application-btgxq.yml | 9 +- .../static/route/reportcase/list_complex.html | 436 ++++++++++++++++++ .../route/reportcase/list_placeonfile.html | 33 +- 9 files changed, 525 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/static/route/reportcase/list_complex.html diff --git a/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseController.java b/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseController.java index 8f29244..3d6b7c0 100755 --- a/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseController.java +++ b/src/main/java/com/cm/systemcity/controller/apis/reportcase/ReportCaseController.java @@ -132,6 +132,19 @@ public class ReportCaseController extends AbstractController { return new SuccessResult(); } + @ApiOperation(value = "删除为复杂案件", notes = "删除为复杂案件接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "上报案件ID列表，用下划线分隔", paramType = "path", example = "1_2_3") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove-to-complex-cases/{id}") + public SuccessResult removeToComplexCases(@PathVariable("id") String id) throws RemoveException { + Map params = getParams(); + params.put("reportCaseIds", Arrays.asList(id)); + reportCaseService.removeToComplexCases(params); + return new SuccessResult(); + } + @ApiOperation(value = "上报案件修改", notes = "上报案件修改接口") @ApiImplicitParams({ @@ -501,6 +514,25 @@ public class ReportCaseController extends AbstractController { return reportCaseService.listReportCaseException(page); } + /** + * 已删除且有争议案件 + */ + @ApiOperation(value = "复杂案件列表（caseStatus=99）", notes = "复杂案件列表接口（caseStatus=99）") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "form", dataType = "Integer", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "form", dataType = "Integer", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "form", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "form", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "form", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-page-report-complex") + public SuccessResultList> listPageReportComplex(ListPage page) throws SearchException { + Map params = requestParams(); + page.setParams(params); + return reportCaseService.listReportCaseComplex(page); + } + @ApiOperation(value = "案件日志列表", notes = "案件日志列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "caseId", value = "案件ID", paramType = "path"), diff --git a/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java b/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java index dc3ed08..21937b6 100755 --- a/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java +++ b/src/main/java/com/cm/systemcity/dao/reportcase/IReportCaseDao.java @@ -384,6 +384,4 @@ public interface IReportCaseDao { List listDept(Map params); Integer countReportCaseAssign(Map reportCaseAssignMap); - - } diff --git a/src/main/java/com/cm/systemcity/pojo/dtos/reportcase/ReportCaseDTO.java b/src/main/java/com/cm/systemcity/pojo/dtos/reportcase/ReportCaseDTO.java index d06af33..6203064 100755 --- a/src/main/java/com/cm/systemcity/pojo/dtos/reportcase/ReportCaseDTO.java +++ b/src/main/java/com/cm/systemcity/pojo/dtos/reportcase/ReportCaseDTO.java @@ -34,7 +34,7 @@ public class ReportCaseDTO { private String communityName; @ApiModelProperty(name = "caseSource", value = "来源") private String caseSource; - @ApiModelProperty(name = "caseStatus", value = "状态") + @ApiModelProperty(name = "caseStatus", value = "状态（值=99为复杂案件）") private String caseStatus; @ApiModelProperty(name = "caseTypeId", value = "类型ID") private String caseTypeId; diff --git a/src/main/java/com/cm/systemcity/service/reportcase/IReportCaseService.java b/src/main/java/com/cm/systemcity/service/reportcase/IReportCaseService.java index 4157fbc..22e02a1 100755 --- a/src/main/java/com/cm/systemcity/service/reportcase/IReportCaseService.java +++ b/src/main/java/com/cm/systemcity/service/reportcase/IReportCaseService.java @@ -490,4 +490,7 @@ public interface IReportCaseService { ReportCaseDTO getReportCaseForDel(Map params); + SuccessResultList> listReportCaseComplex(ListPage page); + + void removeToComplexCases(Map params); } diff --git a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java index 88006f5..386faf6 100755 --- a/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/reportcase/impl/ReportCaseServiceImpl.java @@ -347,6 +347,24 @@ public class ReportCaseServiceImpl extends BaseService implements IReportCaseSer return reportCaseDao.getReportCaseForDel(params); } + @Override + public SuccessResultList> listReportCaseComplex(ListPage page) { + setNPersonAreaParams(page.getParams()); + page.getParams().put("caseStatus", 99); + // caseStatus=99为复杂案件 + PageHelper.startPage(page.getPage(), page.getRows()); + List deleteList = reportCaseDao.listPageReportDelete(page.getParams()); + PageInfo pageInfo = new PageInfo<>(deleteList); + return new SuccessResultList<>(deleteList, pageInfo.getPageNum(), pageInfo.getTotal()); + } + + @Override + public void removeToComplexCases(Map params) { + setUpdateInfo(params); + params.put("caseStatus", 99); + reportCaseDao.removeToDisputedCases(params); + } + @Override public ReportCaseDTO getReportCase(String token, Map params) throws SearchException { ReportCaseDTO dto = reportCaseDao.getReportCase(params); diff --git a/src/main/java/com/cm/systemcity/service/userpoints/impl/UserPointsServiceImpl.java b/src/main/java/com/cm/systemcity/service/userpoints/impl/UserPointsServiceImpl.java index ac44f6c..b88762c 100755 --- a/src/main/java/com/cm/systemcity/service/userpoints/impl/UserPointsServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/userpoints/impl/UserPointsServiceImpl.java @@ -42,7 +42,6 @@ import com.cm.systemcity.service.community.ICommunityService; import com.cm.systemcity.service.communityboss.ICommunityBossService; import com.cm.systemcity.service.dict.IDictService; import com.cm.systemcity.service.userpoints.IUserPointsService; -import javafx.scene.layout.GridPane; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; diff --git a/src/main/resources/application-btgxq.yml b/src/main/resources/application-btgxq.yml index 361e8e8..1217854 100644 --- a/src/main/resources/application-btgxq.yml +++ b/src/main/resources/application-btgxq.yml @@ -1,6 +1,6 @@ server: port: 7022 - url: http://192.168.0.15:7022/servicecity + url: http://192.168.0.4:7022/servicecity title: 生态环保网格化监督平台 servlet: context-path: /servicecity @@ -24,11 +24,12 @@ spring: max-request-size: 1GB datasource: druid: - url: jdbc:mysql://192.168.0.151:3306/db_btgxq_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false + # url: jdbc:mysql://192.168.0.151:3306/db_btgxq_city?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false + url: jdbc:mysql://localhost:3306/db_btgxq?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false db-type: mysql driver-class-name: com.mysql.jdbc.Driver username: root - password: root + password: 123456 initial-size: 2 min-idle: 2 max-active: 10 @@ -81,7 +82,7 @@ file: # 安全 security: oauth2: - oauth-server: http://192.168.0.15:7021/usercenter + oauth-server: http://192.168.0.4:7021/usercenter oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} client: client-id: c024a89b35b04d4d8b5b4ea4d66a8acb diff --git a/src/main/resources/static/route/reportcase/list_complex.html b/src/main/resources/static/route/reportcase/list_complex.html new file mode 100644 index 0000000..78d5dde --- /dev/null +++ b/src/main/resources/static/route/reportcase/list_complex.html @@ -0,0 +1,436 @@ + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+
+
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/reportcase/list_placeonfile.html b/src/main/resources/static/route/reportcase/list_placeonfile.html index a147448..0a721e6 100755 --- a/src/main/resources/static/route/reportcase/list_placeonfile.html +++ b/src/main/resources/static/route/reportcase/list_placeonfile.html @@ -170,9 +170,10 @@ '
操作' + ''+ '
' + - ''+ - ''+ - ''+ + ''+ + ''+ + ''+ + ''+ '
'+ ''+ '
'+ @@ -477,6 +478,32 @@ } }); } + if(obj.event === 'complexEvent') { + top.dialog.msg('确定删除为复杂案件吗？', { + time: 0, + btn: [top.dataMessage.button.yes, top.dataMessage.button.no], + shade: 0.3, + yes: function (index) { + top.dialog.close(index); + var layIndex; + top.restAjax.delete(top.restAjax.path('api/reportcase/remove-to-complex-cases/{id}', [obj.data.reportCaseId]), {}, null, function (code, data) { + // success + top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000}, function () { + reloadTable(); + }); + }, function (code, data) { + // error + top.dialog.msg(data.msg); + }, function () { + // before + layIndex = top.dialog.msg('正在提交...', {icon: 16, time: 0, shade: 0.3}); + }, function () { + // complete + top.dialog.close(layIndex); + }); + } + }); + } }); form.on('select(changeCaseType)',function(data){