().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
new file mode 100644
index 0000000..45d0d45
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.service;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 地图服务配置表 服务类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface IDcmMapConfigService extends IService {
+
+}
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
new file mode 100644
index 0000000..45d0d45
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.service;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 地图服务配置表 服务类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface IDcmMapConfigService extends IService {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
new file mode 100644
index 0000000..9301ccf
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.map.service.impl;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.dao.DcmMapConfigMapper;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图服务配置表 服务实现类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@Service
+public class DcmMapConfigServiceImpl extends ServiceImpl implements IDcmMapConfigService {
+
+}
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
new file mode 100644
index 0000000..45d0d45
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.service;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 地图服务配置表 服务类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface IDcmMapConfigService extends IService {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
new file mode 100644
index 0000000..9301ccf
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.map.service.impl;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.dao.DcmMapConfigMapper;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图服务配置表 服务实现类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@Service
+public class DcmMapConfigServiceImpl extends ServiceImpl implements IDcmMapConfigService {
+
+}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
index c6dadbb..2d8d20b 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
@@ -40,5 +40,11 @@
private String eorc;
+ public CaseSourceDTO() {
+ }
+ public CaseSourceDTO(String caseSource, String caseCode) {
+ this.caseSource = caseSource;
+ this.caseCode = caseCode;
+ }
}
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
new file mode 100644
index 0000000..45d0d45
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.service;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 地图服务配置表 服务类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface IDcmMapConfigService extends IService {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
new file mode 100644
index 0000000..9301ccf
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.map.service.impl;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.dao.DcmMapConfigMapper;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图服务配置表 服务实现类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@Service
+public class DcmMapConfigServiceImpl extends ServiceImpl implements IDcmMapConfigService {
+
+}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
index c6dadbb..2d8d20b 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
@@ -40,5 +40,11 @@
private String eorc;
+ public CaseSourceDTO() {
+ }
+ public CaseSourceDTO(String caseSource, String caseCode) {
+ this.caseSource = caseSource;
+ this.caseCode = caseCode;
+ }
}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
index 704398e..d77606d 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper;
import com.casic.missiles.modular.assess.dto.*;
import com.casic.missiles.modular.assess.model.DepartmentAssessFactor;
import com.casic.missiles.modular.assess.service.IDepartmentAssessService;
+import com.casic.missiles.modular.system.model.Dict;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.NumberFormat;
@@ -30,6 +33,9 @@
private static String[] checkStateArr = {"1", "2"};//1,处置中，2处置完成
private static String[] delayStateArr = {"1", "2"};//1,超时，2未超时
+ @Autowired
+ private ICommonPermissionService permissionService;
+
public String numberFormat(float floatNum) {
NumberFormat nf = NumberFormat.getPercentInstance();
nf.setMinimumFractionDigits(2);
@@ -48,32 +54,32 @@
if ("lastCheckNum".equals(caseType)) {
caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId);
} else if ("currentCheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId);
} else if ("checkedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId);
} else if ("delayCheckedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId);
} else if ("delayUncheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId);
} else if ("redoNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId);
+ caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId);
}
- for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){
+ for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
- caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())?
- sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-");
+ caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ?
+ sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-");
} catch (ParseException e) {
e.printStackTrace();
}
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) {
caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) {
caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
@@ -294,10 +300,10 @@
@Override
public List highCaseEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
- List highEventDTOList = this.baseMapper.highCaseEventList(beg,end);
- for(HighEventDTO highEventDTO:highEventDTOList){
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ List highEventDTOList = this.baseMapper.highCaseEventList(beg, end);
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
@@ -310,26 +316,26 @@
public List highEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList();
- List highEventDTOList = this.baseMapper.highEventList(beg,end);
+ List highEventDTOList = this.baseMapper.highEventList(beg, end);
HighEventDTO highEventTotalDTO = new HighEventDTO();
highEventTotalDTO.setEorc("合计");
highEventTotalDTO.setCaseType("-/-");
- long totalSum=0;
- for(HighEventDTO highEventDTO:highEventDTOList){
- totalSum=totalSum+highEventDTO.getCaseNum();
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ long totalSum = 0;
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ totalSum = totalSum + highEventDTO.getCaseNum();
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) {
highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
}
- highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType());
+ highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType());
}
highEventTotalDTO.setCaseNum(totalSum);
highEventDTOList.add(highEventTotalDTO);
@@ -338,28 +344,33 @@
@Override
public List sourceList(String beg, String end) {
- List sourceDictList=this.baseMapper.sourceDictList();
- List sourceList=this.baseMapper.sourceList(beg,end);
+ List dictList = permissionService.findInDictByCode("caseSource");
+ List sourceDictList = new ArrayList<>();
+ for (Dict dict : dictList) {
+ sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode()));
+ }
+// List sourceDictList = this.baseMapper.sourceDictList();
+ List sourceList = this.baseMapper.sourceList(beg, end);
CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO();
caseSourceTotalDTO.setCaseSource("--");
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- for(CaseSourceDTO sourceDTO:sourceList){
- if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){
- if("1".equals(sourceDTO.getEorc())){
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ for (CaseSourceDTO sourceDTO : sourceList) {
+ if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) {
+ if ("1".equals(sourceDTO.getEorc())) {
caseSourceDTO.setEventNum(sourceDTO.getCaseNum());
- }else if("2".equals(sourceDTO.getEorc())){
+ } else if ("2".equals(sourceDTO.getEorc())) {
caseSourceDTO.setComponentNum(sourceDTO.getCaseNum());
}
}
}
}
- long caseNumSum=0,componentNumSum=0,eventNumSum=0;
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum());
- caseNumSum=caseNumSum+caseSourceDTO.getCaseNum();
- componentNumSum=componentNumSum+caseSourceDTO.getComponentNum();
- eventNumSum=eventNumSum+caseSourceDTO.getEventNum();
+ long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0;
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum());
+ caseNumSum = caseNumSum + caseSourceDTO.getCaseNum();
+ componentNumSum = componentNumSum + caseSourceDTO.getComponentNum();
+ eventNumSum = eventNumSum + caseSourceDTO.getEventNum();
}
caseSourceTotalDTO.setCaseNum(caseNumSum);
caseSourceTotalDTO.setComponentNum(componentNumSum);
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
new file mode 100644
index 0000000..45d0d45
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.service;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 地图服务配置表 服务类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface IDcmMapConfigService extends IService {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
new file mode 100644
index 0000000..9301ccf
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.map.service.impl;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.dao.DcmMapConfigMapper;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图服务配置表 服务实现类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@Service
+public class DcmMapConfigServiceImpl extends ServiceImpl implements IDcmMapConfigService {
+
+}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
index c6dadbb..2d8d20b 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
@@ -40,5 +40,11 @@
private String eorc;
+ public CaseSourceDTO() {
+ }
+ public CaseSourceDTO(String caseSource, String caseCode) {
+ this.caseSource = caseSource;
+ this.caseCode = caseCode;
+ }
}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
index 704398e..d77606d 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper;
import com.casic.missiles.modular.assess.dto.*;
import com.casic.missiles.modular.assess.model.DepartmentAssessFactor;
import com.casic.missiles.modular.assess.service.IDepartmentAssessService;
+import com.casic.missiles.modular.system.model.Dict;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.NumberFormat;
@@ -30,6 +33,9 @@
private static String[] checkStateArr = {"1", "2"};//1,处置中，2处置完成
private static String[] delayStateArr = {"1", "2"};//1,超时，2未超时
+ @Autowired
+ private ICommonPermissionService permissionService;
+
public String numberFormat(float floatNum) {
NumberFormat nf = NumberFormat.getPercentInstance();
nf.setMinimumFractionDigits(2);
@@ -48,32 +54,32 @@
if ("lastCheckNum".equals(caseType)) {
caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId);
} else if ("currentCheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId);
} else if ("checkedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId);
} else if ("delayCheckedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId);
} else if ("delayUncheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId);
} else if ("redoNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId);
+ caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId);
}
- for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){
+ for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
- caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())?
- sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-");
+ caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ?
+ sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-");
} catch (ParseException e) {
e.printStackTrace();
}
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) {
caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) {
caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
@@ -294,10 +300,10 @@
@Override
public List highCaseEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
- List highEventDTOList = this.baseMapper.highCaseEventList(beg,end);
- for(HighEventDTO highEventDTO:highEventDTOList){
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ List highEventDTOList = this.baseMapper.highCaseEventList(beg, end);
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
@@ -310,26 +316,26 @@
public List highEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList();
- List highEventDTOList = this.baseMapper.highEventList(beg,end);
+ List highEventDTOList = this.baseMapper.highEventList(beg, end);
HighEventDTO highEventTotalDTO = new HighEventDTO();
highEventTotalDTO.setEorc("合计");
highEventTotalDTO.setCaseType("-/-");
- long totalSum=0;
- for(HighEventDTO highEventDTO:highEventDTOList){
- totalSum=totalSum+highEventDTO.getCaseNum();
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ long totalSum = 0;
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ totalSum = totalSum + highEventDTO.getCaseNum();
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) {
highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
}
- highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType());
+ highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType());
}
highEventTotalDTO.setCaseNum(totalSum);
highEventDTOList.add(highEventTotalDTO);
@@ -338,28 +344,33 @@
@Override
public List sourceList(String beg, String end) {
- List sourceDictList=this.baseMapper.sourceDictList();
- List sourceList=this.baseMapper.sourceList(beg,end);
+ List dictList = permissionService.findInDictByCode("caseSource");
+ List sourceDictList = new ArrayList<>();
+ for (Dict dict : dictList) {
+ sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode()));
+ }
+// List sourceDictList = this.baseMapper.sourceDictList();
+ List sourceList = this.baseMapper.sourceList(beg, end);
CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO();
caseSourceTotalDTO.setCaseSource("--");
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- for(CaseSourceDTO sourceDTO:sourceList){
- if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){
- if("1".equals(sourceDTO.getEorc())){
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ for (CaseSourceDTO sourceDTO : sourceList) {
+ if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) {
+ if ("1".equals(sourceDTO.getEorc())) {
caseSourceDTO.setEventNum(sourceDTO.getCaseNum());
- }else if("2".equals(sourceDTO.getEorc())){
+ } else if ("2".equals(sourceDTO.getEorc())) {
caseSourceDTO.setComponentNum(sourceDTO.getCaseNum());
}
}
}
}
- long caseNumSum=0,componentNumSum=0,eventNumSum=0;
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum());
- caseNumSum=caseNumSum+caseSourceDTO.getCaseNum();
- componentNumSum=componentNumSum+caseSourceDTO.getComponentNum();
- eventNumSum=eventNumSum+caseSourceDTO.getEventNum();
+ long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0;
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum());
+ caseNumSum = caseNumSum + caseSourceDTO.getCaseNum();
+ componentNumSum = componentNumSum + caseSourceDTO.getComponentNum();
+ eventNumSum = eventNumSum + caseSourceDTO.getEventNum();
}
caseSourceTotalDTO.setCaseNum(caseNumSum);
caseSourceTotalDTO.setComponentNum(componentNumSum);
diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml
index 07ef694..c2d7338 100644
--- a/casic-service-cws/casic-cws-case/pom.xml
+++ b/casic-service-cws/casic-cws-case/pom.xml
@@ -26,6 +26,11 @@
casic-admin-support
${admin.version}
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
new file mode 100644
index 0000000..45d0d45
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.service;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 地图服务配置表 服务类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface IDcmMapConfigService extends IService {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
new file mode 100644
index 0000000..9301ccf
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.map.service.impl;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.dao.DcmMapConfigMapper;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图服务配置表 服务实现类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@Service
+public class DcmMapConfigServiceImpl extends ServiceImpl implements IDcmMapConfigService {
+
+}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
index c6dadbb..2d8d20b 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
@@ -40,5 +40,11 @@
private String eorc;
+ public CaseSourceDTO() {
+ }
+ public CaseSourceDTO(String caseSource, String caseCode) {
+ this.caseSource = caseSource;
+ this.caseCode = caseCode;
+ }
}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
index 704398e..d77606d 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper;
import com.casic.missiles.modular.assess.dto.*;
import com.casic.missiles.modular.assess.model.DepartmentAssessFactor;
import com.casic.missiles.modular.assess.service.IDepartmentAssessService;
+import com.casic.missiles.modular.system.model.Dict;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.NumberFormat;
@@ -30,6 +33,9 @@
private static String[] checkStateArr = {"1", "2"};//1,处置中，2处置完成
private static String[] delayStateArr = {"1", "2"};//1,超时，2未超时
+ @Autowired
+ private ICommonPermissionService permissionService;
+
public String numberFormat(float floatNum) {
NumberFormat nf = NumberFormat.getPercentInstance();
nf.setMinimumFractionDigits(2);
@@ -48,32 +54,32 @@
if ("lastCheckNum".equals(caseType)) {
caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId);
} else if ("currentCheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId);
} else if ("checkedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId);
} else if ("delayCheckedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId);
} else if ("delayUncheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId);
} else if ("redoNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId);
+ caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId);
}
- for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){
+ for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
- caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())?
- sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-");
+ caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ?
+ sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-");
} catch (ParseException e) {
e.printStackTrace();
}
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) {
caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) {
caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
@@ -294,10 +300,10 @@
@Override
public List highCaseEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
- List highEventDTOList = this.baseMapper.highCaseEventList(beg,end);
- for(HighEventDTO highEventDTO:highEventDTOList){
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ List highEventDTOList = this.baseMapper.highCaseEventList(beg, end);
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
@@ -310,26 +316,26 @@
public List highEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList();
- List highEventDTOList = this.baseMapper.highEventList(beg,end);
+ List highEventDTOList = this.baseMapper.highEventList(beg, end);
HighEventDTO highEventTotalDTO = new HighEventDTO();
highEventTotalDTO.setEorc("合计");
highEventTotalDTO.setCaseType("-/-");
- long totalSum=0;
- for(HighEventDTO highEventDTO:highEventDTOList){
- totalSum=totalSum+highEventDTO.getCaseNum();
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ long totalSum = 0;
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ totalSum = totalSum + highEventDTO.getCaseNum();
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) {
highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
}
- highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType());
+ highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType());
}
highEventTotalDTO.setCaseNum(totalSum);
highEventDTOList.add(highEventTotalDTO);
@@ -338,28 +344,33 @@
@Override
public List sourceList(String beg, String end) {
- List sourceDictList=this.baseMapper.sourceDictList();
- List sourceList=this.baseMapper.sourceList(beg,end);
+ List dictList = permissionService.findInDictByCode("caseSource");
+ List sourceDictList = new ArrayList<>();
+ for (Dict dict : dictList) {
+ sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode()));
+ }
+// List sourceDictList = this.baseMapper.sourceDictList();
+ List sourceList = this.baseMapper.sourceList(beg, end);
CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO();
caseSourceTotalDTO.setCaseSource("--");
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- for(CaseSourceDTO sourceDTO:sourceList){
- if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){
- if("1".equals(sourceDTO.getEorc())){
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ for (CaseSourceDTO sourceDTO : sourceList) {
+ if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) {
+ if ("1".equals(sourceDTO.getEorc())) {
caseSourceDTO.setEventNum(sourceDTO.getCaseNum());
- }else if("2".equals(sourceDTO.getEorc())){
+ } else if ("2".equals(sourceDTO.getEorc())) {
caseSourceDTO.setComponentNum(sourceDTO.getCaseNum());
}
}
}
}
- long caseNumSum=0,componentNumSum=0,eventNumSum=0;
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum());
- caseNumSum=caseNumSum+caseSourceDTO.getCaseNum();
- componentNumSum=componentNumSum+caseSourceDTO.getComponentNum();
- eventNumSum=eventNumSum+caseSourceDTO.getEventNum();
+ long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0;
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum());
+ caseNumSum = caseNumSum + caseSourceDTO.getCaseNum();
+ componentNumSum = componentNumSum + caseSourceDTO.getComponentNum();
+ eventNumSum = eventNumSum + caseSourceDTO.getEventNum();
}
caseSourceTotalDTO.setCaseNum(caseNumSum);
caseSourceTotalDTO.setComponentNum(componentNumSum);
diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml
index 07ef694..c2d7338 100644
--- a/casic-service-cws/casic-cws-case/pom.xml
+++ b/casic-service-cws/casic-cws-case/pom.xml
@@ -26,6 +26,11 @@
casic-admin-support
${admin.version}
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
new file mode 100644
index 0000000..45d0d45
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.service;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 地图服务配置表 服务类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface IDcmMapConfigService extends IService {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
new file mode 100644
index 0000000..9301ccf
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.map.service.impl;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.dao.DcmMapConfigMapper;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图服务配置表 服务实现类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@Service
+public class DcmMapConfigServiceImpl extends ServiceImpl implements IDcmMapConfigService {
+
+}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
index c6dadbb..2d8d20b 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
@@ -40,5 +40,11 @@
private String eorc;
+ public CaseSourceDTO() {
+ }
+ public CaseSourceDTO(String caseSource, String caseCode) {
+ this.caseSource = caseSource;
+ this.caseCode = caseCode;
+ }
}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
index 704398e..d77606d 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper;
import com.casic.missiles.modular.assess.dto.*;
import com.casic.missiles.modular.assess.model.DepartmentAssessFactor;
import com.casic.missiles.modular.assess.service.IDepartmentAssessService;
+import com.casic.missiles.modular.system.model.Dict;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.NumberFormat;
@@ -30,6 +33,9 @@
private static String[] checkStateArr = {"1", "2"};//1,处置中，2处置完成
private static String[] delayStateArr = {"1", "2"};//1,超时，2未超时
+ @Autowired
+ private ICommonPermissionService permissionService;
+
public String numberFormat(float floatNum) {
NumberFormat nf = NumberFormat.getPercentInstance();
nf.setMinimumFractionDigits(2);
@@ -48,32 +54,32 @@
if ("lastCheckNum".equals(caseType)) {
caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId);
} else if ("currentCheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId);
} else if ("checkedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId);
} else if ("delayCheckedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId);
} else if ("delayUncheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId);
} else if ("redoNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId);
+ caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId);
}
- for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){
+ for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
- caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())?
- sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-");
+ caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ?
+ sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-");
} catch (ParseException e) {
e.printStackTrace();
}
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) {
caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) {
caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
@@ -294,10 +300,10 @@
@Override
public List highCaseEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
- List highEventDTOList = this.baseMapper.highCaseEventList(beg,end);
- for(HighEventDTO highEventDTO:highEventDTOList){
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ List highEventDTOList = this.baseMapper.highCaseEventList(beg, end);
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
@@ -310,26 +316,26 @@
public List highEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList();
- List highEventDTOList = this.baseMapper.highEventList(beg,end);
+ List highEventDTOList = this.baseMapper.highEventList(beg, end);
HighEventDTO highEventTotalDTO = new HighEventDTO();
highEventTotalDTO.setEorc("合计");
highEventTotalDTO.setCaseType("-/-");
- long totalSum=0;
- for(HighEventDTO highEventDTO:highEventDTOList){
- totalSum=totalSum+highEventDTO.getCaseNum();
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ long totalSum = 0;
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ totalSum = totalSum + highEventDTO.getCaseNum();
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) {
highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
}
- highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType());
+ highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType());
}
highEventTotalDTO.setCaseNum(totalSum);
highEventDTOList.add(highEventTotalDTO);
@@ -338,28 +344,33 @@
@Override
public List sourceList(String beg, String end) {
- List sourceDictList=this.baseMapper.sourceDictList();
- List sourceList=this.baseMapper.sourceList(beg,end);
+ List dictList = permissionService.findInDictByCode("caseSource");
+ List sourceDictList = new ArrayList<>();
+ for (Dict dict : dictList) {
+ sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode()));
+ }
+// List sourceDictList = this.baseMapper.sourceDictList();
+ List sourceList = this.baseMapper.sourceList(beg, end);
CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO();
caseSourceTotalDTO.setCaseSource("--");
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- for(CaseSourceDTO sourceDTO:sourceList){
- if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){
- if("1".equals(sourceDTO.getEorc())){
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ for (CaseSourceDTO sourceDTO : sourceList) {
+ if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) {
+ if ("1".equals(sourceDTO.getEorc())) {
caseSourceDTO.setEventNum(sourceDTO.getCaseNum());
- }else if("2".equals(sourceDTO.getEorc())){
+ } else if ("2".equals(sourceDTO.getEorc())) {
caseSourceDTO.setComponentNum(sourceDTO.getCaseNum());
}
}
}
}
- long caseNumSum=0,componentNumSum=0,eventNumSum=0;
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum());
- caseNumSum=caseNumSum+caseSourceDTO.getCaseNum();
- componentNumSum=componentNumSum+caseSourceDTO.getComponentNum();
- eventNumSum=eventNumSum+caseSourceDTO.getEventNum();
+ long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0;
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum());
+ caseNumSum = caseNumSum + caseSourceDTO.getCaseNum();
+ componentNumSum = componentNumSum + caseSourceDTO.getComponentNum();
+ eventNumSum = eventNumSum + caseSourceDTO.getEventNum();
}
caseSourceTotalDTO.setCaseNum(caseNumSum);
caseSourceTotalDTO.setComponentNum(componentNumSum);
diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml
index 07ef694..c2d7338 100644
--- a/casic-service-cws/casic-cws-case/pom.xml
+++ b/casic-service-cws/casic-cws-case/pom.xml
@@ -26,6 +26,11 @@
casic-admin-support
${admin.version}
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index ee36630..672cfd2 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -1,12 +1,14 @@
package com.casic.missiles.modular.cwscase.controller;
import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageInfoBT;
import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum;
import com.casic.missiles.modular.cwscase.model.*;
import com.casic.missiles.modular.enums.CaseLevelEnum;
@@ -20,20 +22,26 @@
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import org.springframework.web.bind.annotation.RestController;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.casic.missiles.modular.cwscase.service.ICwsCaseService;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 控制器
@@ -44,7 +52,7 @@
//@Controller
@RestController
@RequestMapping("/case")
-public class CwsCaseController extends BaseController {
+public class CwsCaseController extends ExportController {
@Autowired
@@ -68,6 +76,10 @@
@Autowired
private ICaseFlowService caseFlowService;
+ @Value("${casic.office.maxRowsExcel}")
+ private int maxRowsExcel;
+ @Value("${casic.config.config-path}")
+ private String templatePath;
/**
* 获取列表
*/
@@ -695,8 +707,8 @@
*/
@RequestMapping(value = "/isCriticalListPage")
@ResponseBody
- public Object isCriticalListPage(String isSupervise) {
- QueryCondition queryCondition = new QueryCondition();
+ public Object isCriticalListPage(QueryCondition queryCondition, String isSupervise) {
+// QueryCondition queryCondition = new QueryCondition();
//紧急案卷
queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
@@ -883,4 +895,109 @@
return super.packForBT(page);
}
+
+
+ /**
+ * 综合查询导出
+ */
+ @RequestMapping(value = "/export")
+// @ResponseBody
+ public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException {
+ int specialQuery =0;
+ specialQuery= queryCondition.getSpecialQuery();
+ if(specialQuery>0) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = formatter.format(new Date());
+ if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+ //未超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("0");
+ } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
+ //超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
+ //超期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
+ //按期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("0");
+ }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
+ //未结案
+ queryCondition.setIsClose("0");
+ }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
+ //已立案
+ queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
+ //queryCondition.setRegisterTimeEnd(today);
+ }
+ }
+
+ List> results = queryExportByCondition(queryCondition);
+ FileInputStream fileInputStream = null;
+ if (ToolUtil.isEmpty(results)) {
+ fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+ } else {
+ fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+ }
+
+ try {
+ httpServletResponse.setContentType("application/octet-stream");
+ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
+
+ Map var = new HashMap<>();
+ var.put("标题", "案卷综合查询一览表");
+ var.put("list", results);
+ ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ httpServletResponse.getOutputStream().flush();
+ httpServletResponse.getOutputStream().close();
+ fileInputStream.close();
+ }
+ }
+
+
+ public List> queryExportByCondition(QueryCondition queryCondition){
+ List> results = null;
+ Page> page = new PageFactory>().defaultPage();
+ page.setLimit(maxRowsExcel);
+ page.setSize(maxRowsExcel);
+ page.setOffset(0);
+ page.setSearchCount(false);
+ DataScope dataScope =null;
+ try {
+ if (queryCondition.isDataScope() == true) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ else {
+ String isRevisit = queryCondition.getIsRevisit();
+ String isOvertime = queryCondition.getIsOvertime();
+ String caseLevel = queryCondition.getCaseLevel();
+
+ //回访、超时、紧急案件的查询需要判断是否有数据权限
+ if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ List roles = shiroUser.getRoleTips();
+ if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ }
+ }
+ }
+ catch (Exception e){
+ String mes = e.getMessage().toString();
+ }
+ results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+ new CwsCaseWarpper(results).warp();
+ return results;
+ }
+
}
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
new file mode 100644
index 0000000..45d0d45
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.service;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 地图服务配置表 服务类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface IDcmMapConfigService extends IService {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
new file mode 100644
index 0000000..9301ccf
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.map.service.impl;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.dao.DcmMapConfigMapper;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图服务配置表 服务实现类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@Service
+public class DcmMapConfigServiceImpl extends ServiceImpl implements IDcmMapConfigService {
+
+}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
index c6dadbb..2d8d20b 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
@@ -40,5 +40,11 @@
private String eorc;
+ public CaseSourceDTO() {
+ }
+ public CaseSourceDTO(String caseSource, String caseCode) {
+ this.caseSource = caseSource;
+ this.caseCode = caseCode;
+ }
}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
index 704398e..d77606d 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper;
import com.casic.missiles.modular.assess.dto.*;
import com.casic.missiles.modular.assess.model.DepartmentAssessFactor;
import com.casic.missiles.modular.assess.service.IDepartmentAssessService;
+import com.casic.missiles.modular.system.model.Dict;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.NumberFormat;
@@ -30,6 +33,9 @@
private static String[] checkStateArr = {"1", "2"};//1,处置中，2处置完成
private static String[] delayStateArr = {"1", "2"};//1,超时，2未超时
+ @Autowired
+ private ICommonPermissionService permissionService;
+
public String numberFormat(float floatNum) {
NumberFormat nf = NumberFormat.getPercentInstance();
nf.setMinimumFractionDigits(2);
@@ -48,32 +54,32 @@
if ("lastCheckNum".equals(caseType)) {
caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId);
} else if ("currentCheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId);
} else if ("checkedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId);
} else if ("delayCheckedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId);
} else if ("delayUncheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId);
} else if ("redoNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId);
+ caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId);
}
- for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){
+ for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
- caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())?
- sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-");
+ caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ?
+ sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-");
} catch (ParseException e) {
e.printStackTrace();
}
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) {
caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) {
caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
@@ -294,10 +300,10 @@
@Override
public List highCaseEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
- List highEventDTOList = this.baseMapper.highCaseEventList(beg,end);
- for(HighEventDTO highEventDTO:highEventDTOList){
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ List highEventDTOList = this.baseMapper.highCaseEventList(beg, end);
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
@@ -310,26 +316,26 @@
public List highEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList();
- List highEventDTOList = this.baseMapper.highEventList(beg,end);
+ List highEventDTOList = this.baseMapper.highEventList(beg, end);
HighEventDTO highEventTotalDTO = new HighEventDTO();
highEventTotalDTO.setEorc("合计");
highEventTotalDTO.setCaseType("-/-");
- long totalSum=0;
- for(HighEventDTO highEventDTO:highEventDTOList){
- totalSum=totalSum+highEventDTO.getCaseNum();
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ long totalSum = 0;
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ totalSum = totalSum + highEventDTO.getCaseNum();
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) {
highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
}
- highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType());
+ highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType());
}
highEventTotalDTO.setCaseNum(totalSum);
highEventDTOList.add(highEventTotalDTO);
@@ -338,28 +344,33 @@
@Override
public List sourceList(String beg, String end) {
- List sourceDictList=this.baseMapper.sourceDictList();
- List sourceList=this.baseMapper.sourceList(beg,end);
+ List dictList = permissionService.findInDictByCode("caseSource");
+ List sourceDictList = new ArrayList<>();
+ for (Dict dict : dictList) {
+ sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode()));
+ }
+// List sourceDictList = this.baseMapper.sourceDictList();
+ List sourceList = this.baseMapper.sourceList(beg, end);
CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO();
caseSourceTotalDTO.setCaseSource("--");
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- for(CaseSourceDTO sourceDTO:sourceList){
- if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){
- if("1".equals(sourceDTO.getEorc())){
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ for (CaseSourceDTO sourceDTO : sourceList) {
+ if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) {
+ if ("1".equals(sourceDTO.getEorc())) {
caseSourceDTO.setEventNum(sourceDTO.getCaseNum());
- }else if("2".equals(sourceDTO.getEorc())){
+ } else if ("2".equals(sourceDTO.getEorc())) {
caseSourceDTO.setComponentNum(sourceDTO.getCaseNum());
}
}
}
}
- long caseNumSum=0,componentNumSum=0,eventNumSum=0;
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum());
- caseNumSum=caseNumSum+caseSourceDTO.getCaseNum();
- componentNumSum=componentNumSum+caseSourceDTO.getComponentNum();
- eventNumSum=eventNumSum+caseSourceDTO.getEventNum();
+ long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0;
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum());
+ caseNumSum = caseNumSum + caseSourceDTO.getCaseNum();
+ componentNumSum = componentNumSum + caseSourceDTO.getComponentNum();
+ eventNumSum = eventNumSum + caseSourceDTO.getEventNum();
}
caseSourceTotalDTO.setCaseNum(caseNumSum);
caseSourceTotalDTO.setComponentNum(componentNumSum);
diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml
index 07ef694..c2d7338 100644
--- a/casic-service-cws/casic-cws-case/pom.xml
+++ b/casic-service-cws/casic-cws-case/pom.xml
@@ -26,6 +26,11 @@
casic-admin-support
${admin.version}
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index ee36630..672cfd2 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -1,12 +1,14 @@
package com.casic.missiles.modular.cwscase.controller;
import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageInfoBT;
import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum;
import com.casic.missiles.modular.cwscase.model.*;
import com.casic.missiles.modular.enums.CaseLevelEnum;
@@ -20,20 +22,26 @@
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import org.springframework.web.bind.annotation.RestController;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.casic.missiles.modular.cwscase.service.ICwsCaseService;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 控制器
@@ -44,7 +52,7 @@
//@Controller
@RestController
@RequestMapping("/case")
-public class CwsCaseController extends BaseController {
+public class CwsCaseController extends ExportController {
@Autowired
@@ -68,6 +76,10 @@
@Autowired
private ICaseFlowService caseFlowService;
+ @Value("${casic.office.maxRowsExcel}")
+ private int maxRowsExcel;
+ @Value("${casic.config.config-path}")
+ private String templatePath;
/**
* 获取列表
*/
@@ -695,8 +707,8 @@
*/
@RequestMapping(value = "/isCriticalListPage")
@ResponseBody
- public Object isCriticalListPage(String isSupervise) {
- QueryCondition queryCondition = new QueryCondition();
+ public Object isCriticalListPage(QueryCondition queryCondition, String isSupervise) {
+// QueryCondition queryCondition = new QueryCondition();
//紧急案卷
queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
@@ -883,4 +895,109 @@
return super.packForBT(page);
}
+
+
+ /**
+ * 综合查询导出
+ */
+ @RequestMapping(value = "/export")
+// @ResponseBody
+ public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException {
+ int specialQuery =0;
+ specialQuery= queryCondition.getSpecialQuery();
+ if(specialQuery>0) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = formatter.format(new Date());
+ if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+ //未超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("0");
+ } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
+ //超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
+ //超期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
+ //按期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("0");
+ }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
+ //未结案
+ queryCondition.setIsClose("0");
+ }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
+ //已立案
+ queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
+ //queryCondition.setRegisterTimeEnd(today);
+ }
+ }
+
+ List> results = queryExportByCondition(queryCondition);
+ FileInputStream fileInputStream = null;
+ if (ToolUtil.isEmpty(results)) {
+ fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+ } else {
+ fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+ }
+
+ try {
+ httpServletResponse.setContentType("application/octet-stream");
+ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
+
+ Map var = new HashMap<>();
+ var.put("标题", "案卷综合查询一览表");
+ var.put("list", results);
+ ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ httpServletResponse.getOutputStream().flush();
+ httpServletResponse.getOutputStream().close();
+ fileInputStream.close();
+ }
+ }
+
+
+ public List> queryExportByCondition(QueryCondition queryCondition){
+ List> results = null;
+ Page> page = new PageFactory>().defaultPage();
+ page.setLimit(maxRowsExcel);
+ page.setSize(maxRowsExcel);
+ page.setOffset(0);
+ page.setSearchCount(false);
+ DataScope dataScope =null;
+ try {
+ if (queryCondition.isDataScope() == true) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ else {
+ String isRevisit = queryCondition.getIsRevisit();
+ String isOvertime = queryCondition.getIsOvertime();
+ String caseLevel = queryCondition.getCaseLevel();
+
+ //回访、超时、紧急案件的查询需要判断是否有数据权限
+ if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ List roles = shiroUser.getRoleTips();
+ if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ }
+ }
+ }
+ catch (Exception e){
+ String mes = e.getMessage().toString();
+ }
+ results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+ new CwsCaseWarpper(results).warp();
+ return results;
+ }
+
}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index bccd41b..6a891bb 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -280,9 +280,16 @@
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index ee36630..672cfd2 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -1,12 +1,14 @@
package com.casic.missiles.modular.cwscase.controller;
import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageInfoBT;
import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum;
import com.casic.missiles.modular.cwscase.model.*;
import com.casic.missiles.modular.enums.CaseLevelEnum;
@@ -20,20 +22,26 @@
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import org.springframework.web.bind.annotation.RestController;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.casic.missiles.modular.cwscase.service.ICwsCaseService;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 控制器
@@ -44,7 +52,7 @@
//@Controller
@RestController
@RequestMapping("/case")
-public class CwsCaseController extends BaseController {
+public class CwsCaseController extends ExportController {
@Autowired
@@ -68,6 +76,10 @@
@Autowired
private ICaseFlowService caseFlowService;
+ @Value("${casic.office.maxRowsExcel}")
+ private int maxRowsExcel;
+ @Value("${casic.config.config-path}")
+ private String templatePath;
/**
* 获取列表
*/
@@ -695,8 +707,8 @@
*/
@RequestMapping(value = "/isCriticalListPage")
@ResponseBody
- public Object isCriticalListPage(String isSupervise) {
- QueryCondition queryCondition = new QueryCondition();
+ public Object isCriticalListPage(QueryCondition queryCondition, String isSupervise) {
+// QueryCondition queryCondition = new QueryCondition();
//紧急案卷
queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
@@ -883,4 +895,109 @@
return super.packForBT(page);
}
+
+
+ /**
+ * 综合查询导出
+ */
+ @RequestMapping(value = "/export")
+// @ResponseBody
+ public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException {
+ int specialQuery =0;
+ specialQuery= queryCondition.getSpecialQuery();
+ if(specialQuery>0) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = formatter.format(new Date());
+ if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+ //未超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("0");
+ } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
+ //超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
+ //超期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
+ //按期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("0");
+ }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
+ //未结案
+ queryCondition.setIsClose("0");
+ }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
+ //已立案
+ queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
+ //queryCondition.setRegisterTimeEnd(today);
+ }
+ }
+
+ List> results = queryExportByCondition(queryCondition);
+ FileInputStream fileInputStream = null;
+ if (ToolUtil.isEmpty(results)) {
+ fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+ } else {
+ fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+ }
+
+ try {
+ httpServletResponse.setContentType("application/octet-stream");
+ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
+
+ Map var = new HashMap<>();
+ var.put("标题", "案卷综合查询一览表");
+ var.put("list", results);
+ ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ httpServletResponse.getOutputStream().flush();
+ httpServletResponse.getOutputStream().close();
+ fileInputStream.close();
+ }
+ }
+
+
+ public List> queryExportByCondition(QueryCondition queryCondition){
+ List> results = null;
+ Page> page = new PageFactory>().defaultPage();
+ page.setLimit(maxRowsExcel);
+ page.setSize(maxRowsExcel);
+ page.setOffset(0);
+ page.setSearchCount(false);
+ DataScope dataScope =null;
+ try {
+ if (queryCondition.isDataScope() == true) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ else {
+ String isRevisit = queryCondition.getIsRevisit();
+ String isOvertime = queryCondition.getIsOvertime();
+ String caseLevel = queryCondition.getCaseLevel();
+
+ //回访、超时、紧急案件的查询需要判断是否有数据权限
+ if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ List roles = shiroUser.getRoleTips();
+ if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ }
+ }
+ }
+ catch (Exception e){
+ String mes = e.getMessage().toString();
+ }
+ results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+ new CwsCaseWarpper(results).warp();
+ return results;
+ }
+
}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index bccd41b..6a891bb 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -280,9 +280,16 @@
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index ee36630..672cfd2 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -1,12 +1,14 @@
package com.casic.missiles.modular.cwscase.controller;
import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageInfoBT;
import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum;
import com.casic.missiles.modular.cwscase.model.*;
import com.casic.missiles.modular.enums.CaseLevelEnum;
@@ -20,20 +22,26 @@
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import org.springframework.web.bind.annotation.RestController;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.casic.missiles.modular.cwscase.service.ICwsCaseService;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 控制器
@@ -44,7 +52,7 @@
//@Controller
@RestController
@RequestMapping("/case")
-public class CwsCaseController extends BaseController {
+public class CwsCaseController extends ExportController {
@Autowired
@@ -68,6 +76,10 @@
@Autowired
private ICaseFlowService caseFlowService;
+ @Value("${casic.office.maxRowsExcel}")
+ private int maxRowsExcel;
+ @Value("${casic.config.config-path}")
+ private String templatePath;
/**
* 获取列表
*/
@@ -695,8 +707,8 @@
*/
@RequestMapping(value = "/isCriticalListPage")
@ResponseBody
- public Object isCriticalListPage(String isSupervise) {
- QueryCondition queryCondition = new QueryCondition();
+ public Object isCriticalListPage(QueryCondition queryCondition, String isSupervise) {
+// QueryCondition queryCondition = new QueryCondition();
//紧急案卷
queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
@@ -883,4 +895,109 @@
return super.packForBT(page);
}
+
+
+ /**
+ * 综合查询导出
+ */
+ @RequestMapping(value = "/export")
+// @ResponseBody
+ public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException {
+ int specialQuery =0;
+ specialQuery= queryCondition.getSpecialQuery();
+ if(specialQuery>0) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = formatter.format(new Date());
+ if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+ //未超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("0");
+ } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
+ //超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
+ //超期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
+ //按期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("0");
+ }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
+ //未结案
+ queryCondition.setIsClose("0");
+ }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
+ //已立案
+ queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
+ //queryCondition.setRegisterTimeEnd(today);
+ }
+ }
+
+ List> results = queryExportByCondition(queryCondition);
+ FileInputStream fileInputStream = null;
+ if (ToolUtil.isEmpty(results)) {
+ fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+ } else {
+ fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+ }
+
+ try {
+ httpServletResponse.setContentType("application/octet-stream");
+ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
+
+ Map var = new HashMap<>();
+ var.put("标题", "案卷综合查询一览表");
+ var.put("list", results);
+ ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ httpServletResponse.getOutputStream().flush();
+ httpServletResponse.getOutputStream().close();
+ fileInputStream.close();
+ }
+ }
+
+
+ public List> queryExportByCondition(QueryCondition queryCondition){
+ List> results = null;
+ Page> page = new PageFactory>().defaultPage();
+ page.setLimit(maxRowsExcel);
+ page.setSize(maxRowsExcel);
+ page.setOffset(0);
+ page.setSearchCount(false);
+ DataScope dataScope =null;
+ try {
+ if (queryCondition.isDataScope() == true) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ else {
+ String isRevisit = queryCondition.getIsRevisit();
+ String isOvertime = queryCondition.getIsOvertime();
+ String caseLevel = queryCondition.getCaseLevel();
+
+ //回访、超时、紧急案件的查询需要判断是否有数据权限
+ if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ List roles = shiroUser.getRoleTips();
+ if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ }
+ }
+ }
+ catch (Exception e){
+ String mes = e.getMessage().toString();
+ }
+ results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+ new CwsCaseWarpper(results).warp();
+ return results;
+ }
+
}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index bccd41b..6a891bb 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -280,9 +280,16 @@
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index ee36630..672cfd2 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -1,12 +1,14 @@
package com.casic.missiles.modular.cwscase.controller;
import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageInfoBT;
import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum;
import com.casic.missiles.modular.cwscase.model.*;
import com.casic.missiles.modular.enums.CaseLevelEnum;
@@ -20,20 +22,26 @@
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import org.springframework.web.bind.annotation.RestController;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.casic.missiles.modular.cwscase.service.ICwsCaseService;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 控制器
@@ -44,7 +52,7 @@
//@Controller
@RestController
@RequestMapping("/case")
-public class CwsCaseController extends BaseController {
+public class CwsCaseController extends ExportController {
@Autowired
@@ -68,6 +76,10 @@
@Autowired
private ICaseFlowService caseFlowService;
+ @Value("${casic.office.maxRowsExcel}")
+ private int maxRowsExcel;
+ @Value("${casic.config.config-path}")
+ private String templatePath;
/**
* 获取列表
*/
@@ -695,8 +707,8 @@
*/
@RequestMapping(value = "/isCriticalListPage")
@ResponseBody
- public Object isCriticalListPage(String isSupervise) {
- QueryCondition queryCondition = new QueryCondition();
+ public Object isCriticalListPage(QueryCondition queryCondition, String isSupervise) {
+// QueryCondition queryCondition = new QueryCondition();
//紧急案卷
queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
@@ -883,4 +895,109 @@
return super.packForBT(page);
}
+
+
+ /**
+ * 综合查询导出
+ */
+ @RequestMapping(value = "/export")
+// @ResponseBody
+ public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException {
+ int specialQuery =0;
+ specialQuery= queryCondition.getSpecialQuery();
+ if(specialQuery>0) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = formatter.format(new Date());
+ if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+ //未超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("0");
+ } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
+ //超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
+ //超期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
+ //按期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("0");
+ }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
+ //未结案
+ queryCondition.setIsClose("0");
+ }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
+ //已立案
+ queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
+ //queryCondition.setRegisterTimeEnd(today);
+ }
+ }
+
+ List> results = queryExportByCondition(queryCondition);
+ FileInputStream fileInputStream = null;
+ if (ToolUtil.isEmpty(results)) {
+ fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+ } else {
+ fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+ }
+
+ try {
+ httpServletResponse.setContentType("application/octet-stream");
+ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
+
+ Map var = new HashMap<>();
+ var.put("标题", "案卷综合查询一览表");
+ var.put("list", results);
+ ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ httpServletResponse.getOutputStream().flush();
+ httpServletResponse.getOutputStream().close();
+ fileInputStream.close();
+ }
+ }
+
+
+ public List> queryExportByCondition(QueryCondition queryCondition){
+ List> results = null;
+ Page> page = new PageFactory>().defaultPage();
+ page.setLimit(maxRowsExcel);
+ page.setSize(maxRowsExcel);
+ page.setOffset(0);
+ page.setSearchCount(false);
+ DataScope dataScope =null;
+ try {
+ if (queryCondition.isDataScope() == true) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ else {
+ String isRevisit = queryCondition.getIsRevisit();
+ String isOvertime = queryCondition.getIsOvertime();
+ String caseLevel = queryCondition.getCaseLevel();
+
+ //回访、超时、紧急案件的查询需要判断是否有数据权限
+ if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ List roles = shiroUser.getRoleTips();
+ if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ }
+ }
+ }
+ catch (Exception e){
+ String mes = e.getMessage().toString();
+ }
+ results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+ new CwsCaseWarpper(results).warp();
+ return results;
+ }
+
}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index bccd41b..6a891bb 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -280,9 +280,16 @@
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index ee36630..672cfd2 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -1,12 +1,14 @@
package com.casic.missiles.modular.cwscase.controller;
import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageInfoBT;
import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum;
import com.casic.missiles.modular.cwscase.model.*;
import com.casic.missiles.modular.enums.CaseLevelEnum;
@@ -20,20 +22,26 @@
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import org.springframework.web.bind.annotation.RestController;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.casic.missiles.modular.cwscase.service.ICwsCaseService;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 控制器
@@ -44,7 +52,7 @@
//@Controller
@RestController
@RequestMapping("/case")
-public class CwsCaseController extends BaseController {
+public class CwsCaseController extends ExportController {
@Autowired
@@ -68,6 +76,10 @@
@Autowired
private ICaseFlowService caseFlowService;
+ @Value("${casic.office.maxRowsExcel}")
+ private int maxRowsExcel;
+ @Value("${casic.config.config-path}")
+ private String templatePath;
/**
* 获取列表
*/
@@ -695,8 +707,8 @@
*/
@RequestMapping(value = "/isCriticalListPage")
@ResponseBody
- public Object isCriticalListPage(String isSupervise) {
- QueryCondition queryCondition = new QueryCondition();
+ public Object isCriticalListPage(QueryCondition queryCondition, String isSupervise) {
+// QueryCondition queryCondition = new QueryCondition();
//紧急案卷
queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
@@ -883,4 +895,109 @@
return super.packForBT(page);
}
+
+
+ /**
+ * 综合查询导出
+ */
+ @RequestMapping(value = "/export")
+// @ResponseBody
+ public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException {
+ int specialQuery =0;
+ specialQuery= queryCondition.getSpecialQuery();
+ if(specialQuery>0) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = formatter.format(new Date());
+ if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+ //未超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("0");
+ } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
+ //超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
+ //超期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
+ //按期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("0");
+ }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
+ //未结案
+ queryCondition.setIsClose("0");
+ }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
+ //已立案
+ queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
+ //queryCondition.setRegisterTimeEnd(today);
+ }
+ }
+
+ List> results = queryExportByCondition(queryCondition);
+ FileInputStream fileInputStream = null;
+ if (ToolUtil.isEmpty(results)) {
+ fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+ } else {
+ fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+ }
+
+ try {
+ httpServletResponse.setContentType("application/octet-stream");
+ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
+
+ Map var = new HashMap<>();
+ var.put("标题", "案卷综合查询一览表");
+ var.put("list", results);
+ ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ httpServletResponse.getOutputStream().flush();
+ httpServletResponse.getOutputStream().close();
+ fileInputStream.close();
+ }
+ }
+
+
+ public List> queryExportByCondition(QueryCondition queryCondition){
+ List> results = null;
+ Page> page = new PageFactory>().defaultPage();
+ page.setLimit(maxRowsExcel);
+ page.setSize(maxRowsExcel);
+ page.setOffset(0);
+ page.setSearchCount(false);
+ DataScope dataScope =null;
+ try {
+ if (queryCondition.isDataScope() == true) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ else {
+ String isRevisit = queryCondition.getIsRevisit();
+ String isOvertime = queryCondition.getIsOvertime();
+ String caseLevel = queryCondition.getCaseLevel();
+
+ //回访、超时、紧急案件的查询需要判断是否有数据权限
+ if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ List roles = shiroUser.getRoleTips();
+ if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ }
+ }
+ }
+ catch (Exception e){
+ String mes = e.getMessage().toString();
+ }
+ results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+ new CwsCaseWarpper(results).warp();
+ return results;
+ }
+
}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index bccd41b..6a891bb 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -280,9 +280,16 @@
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index ee36630..672cfd2 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -1,12 +1,14 @@
package com.casic.missiles.modular.cwscase.controller;
import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageInfoBT;
import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum;
import com.casic.missiles.modular.cwscase.model.*;
import com.casic.missiles.modular.enums.CaseLevelEnum;
@@ -20,20 +22,26 @@
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import org.springframework.web.bind.annotation.RestController;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.casic.missiles.modular.cwscase.service.ICwsCaseService;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 控制器
@@ -44,7 +52,7 @@
//@Controller
@RestController
@RequestMapping("/case")
-public class CwsCaseController extends BaseController {
+public class CwsCaseController extends ExportController {
@Autowired
@@ -68,6 +76,10 @@
@Autowired
private ICaseFlowService caseFlowService;
+ @Value("${casic.office.maxRowsExcel}")
+ private int maxRowsExcel;
+ @Value("${casic.config.config-path}")
+ private String templatePath;
/**
* 获取列表
*/
@@ -695,8 +707,8 @@
*/
@RequestMapping(value = "/isCriticalListPage")
@ResponseBody
- public Object isCriticalListPage(String isSupervise) {
- QueryCondition queryCondition = new QueryCondition();
+ public Object isCriticalListPage(QueryCondition queryCondition, String isSupervise) {
+// QueryCondition queryCondition = new QueryCondition();
//紧急案卷
queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
@@ -883,4 +895,109 @@
return super.packForBT(page);
}
+
+
+ /**
+ * 综合查询导出
+ */
+ @RequestMapping(value = "/export")
+// @ResponseBody
+ public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException {
+ int specialQuery =0;
+ specialQuery= queryCondition.getSpecialQuery();
+ if(specialQuery>0) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = formatter.format(new Date());
+ if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+ //未超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("0");
+ } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
+ //超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
+ //超期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
+ //按期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("0");
+ }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
+ //未结案
+ queryCondition.setIsClose("0");
+ }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
+ //已立案
+ queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
+ //queryCondition.setRegisterTimeEnd(today);
+ }
+ }
+
+ List> results = queryExportByCondition(queryCondition);
+ FileInputStream fileInputStream = null;
+ if (ToolUtil.isEmpty(results)) {
+ fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+ } else {
+ fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+ }
+
+ try {
+ httpServletResponse.setContentType("application/octet-stream");
+ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
+
+ Map var = new HashMap<>();
+ var.put("标题", "案卷综合查询一览表");
+ var.put("list", results);
+ ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ httpServletResponse.getOutputStream().flush();
+ httpServletResponse.getOutputStream().close();
+ fileInputStream.close();
+ }
+ }
+
+
+ public List> queryExportByCondition(QueryCondition queryCondition){
+ List> results = null;
+ Page> page = new PageFactory>().defaultPage();
+ page.setLimit(maxRowsExcel);
+ page.setSize(maxRowsExcel);
+ page.setOffset(0);
+ page.setSearchCount(false);
+ DataScope dataScope =null;
+ try {
+ if (queryCondition.isDataScope() == true) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ else {
+ String isRevisit = queryCondition.getIsRevisit();
+ String isOvertime = queryCondition.getIsOvertime();
+ String caseLevel = queryCondition.getCaseLevel();
+
+ //回访、超时、紧急案件的查询需要判断是否有数据权限
+ if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ List roles = shiroUser.getRoleTips();
+ if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ }
+ }
+ }
+ catch (Exception e){
+ String mes = e.getMessage().toString();
+ }
+ results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+ new CwsCaseWarpper(results).warp();
+ return results;
+ }
+
}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index bccd41b..6a891bb 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -280,9 +280,16 @@
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index ee36630..672cfd2 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -1,12 +1,14 @@
package com.casic.missiles.modular.cwscase.controller;
import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageInfoBT;
import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum;
import com.casic.missiles.modular.cwscase.model.*;
import com.casic.missiles.modular.enums.CaseLevelEnum;
@@ -20,20 +22,26 @@
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import org.springframework.web.bind.annotation.RestController;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.casic.missiles.modular.cwscase.service.ICwsCaseService;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 控制器
@@ -44,7 +52,7 @@
//@Controller
@RestController
@RequestMapping("/case")
-public class CwsCaseController extends BaseController {
+public class CwsCaseController extends ExportController {
@Autowired
@@ -68,6 +76,10 @@
@Autowired
private ICaseFlowService caseFlowService;
+ @Value("${casic.office.maxRowsExcel}")
+ private int maxRowsExcel;
+ @Value("${casic.config.config-path}")
+ private String templatePath;
/**
* 获取列表
*/
@@ -695,8 +707,8 @@
*/
@RequestMapping(value = "/isCriticalListPage")
@ResponseBody
- public Object isCriticalListPage(String isSupervise) {
- QueryCondition queryCondition = new QueryCondition();
+ public Object isCriticalListPage(QueryCondition queryCondition, String isSupervise) {
+// QueryCondition queryCondition = new QueryCondition();
//紧急案卷
queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
@@ -883,4 +895,109 @@
return super.packForBT(page);
}
+
+
+ /**
+ * 综合查询导出
+ */
+ @RequestMapping(value = "/export")
+// @ResponseBody
+ public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException {
+ int specialQuery =0;
+ specialQuery= queryCondition.getSpecialQuery();
+ if(specialQuery>0) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = formatter.format(new Date());
+ if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+ //未超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("0");
+ } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
+ //超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
+ //超期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
+ //按期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("0");
+ }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
+ //未结案
+ queryCondition.setIsClose("0");
+ }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
+ //已立案
+ queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
+ //queryCondition.setRegisterTimeEnd(today);
+ }
+ }
+
+ List> results = queryExportByCondition(queryCondition);
+ FileInputStream fileInputStream = null;
+ if (ToolUtil.isEmpty(results)) {
+ fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+ } else {
+ fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+ }
+
+ try {
+ httpServletResponse.setContentType("application/octet-stream");
+ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
+
+ Map var = new HashMap<>();
+ var.put("标题", "案卷综合查询一览表");
+ var.put("list", results);
+ ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ httpServletResponse.getOutputStream().flush();
+ httpServletResponse.getOutputStream().close();
+ fileInputStream.close();
+ }
+ }
+
+
+ public List> queryExportByCondition(QueryCondition queryCondition){
+ List> results = null;
+ Page> page = new PageFactory>().defaultPage();
+ page.setLimit(maxRowsExcel);
+ page.setSize(maxRowsExcel);
+ page.setOffset(0);
+ page.setSearchCount(false);
+ DataScope dataScope =null;
+ try {
+ if (queryCondition.isDataScope() == true) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ else {
+ String isRevisit = queryCondition.getIsRevisit();
+ String isOvertime = queryCondition.getIsOvertime();
+ String caseLevel = queryCondition.getCaseLevel();
+
+ //回访、超时、紧急案件的查询需要判断是否有数据权限
+ if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ List roles = shiroUser.getRoleTips();
+ if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ }
+ }
+ }
+ catch (Exception e){
+ String mes = e.getMessage().toString();
+ }
+ results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+ new CwsCaseWarpper(results).warp();
+ return results;
+ }
+
}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index bccd41b..6a891bb 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -280,9 +280,16 @@
+
+ com.casic
+ casic-server
+ ${pro.version}
+
org.springframework.boot
@@ -231,11 +236,11 @@
groovy-all
true
-
- com.oracle
- ojdbc6
- ${oracle.version}
-
+
+
+
+
+
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
new file mode 100644
index 0000000..45d0d45
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.service;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 地图服务配置表 服务类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface IDcmMapConfigService extends IService {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
new file mode 100644
index 0000000..9301ccf
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.map.service.impl;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.dao.DcmMapConfigMapper;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图服务配置表 服务实现类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@Service
+public class DcmMapConfigServiceImpl extends ServiceImpl implements IDcmMapConfigService {
+
+}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
index c6dadbb..2d8d20b 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
@@ -40,5 +40,11 @@
private String eorc;
+ public CaseSourceDTO() {
+ }
+ public CaseSourceDTO(String caseSource, String caseCode) {
+ this.caseSource = caseSource;
+ this.caseCode = caseCode;
+ }
}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
index 704398e..d77606d 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper;
import com.casic.missiles.modular.assess.dto.*;
import com.casic.missiles.modular.assess.model.DepartmentAssessFactor;
import com.casic.missiles.modular.assess.service.IDepartmentAssessService;
+import com.casic.missiles.modular.system.model.Dict;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.NumberFormat;
@@ -30,6 +33,9 @@
private static String[] checkStateArr = {"1", "2"};//1,处置中，2处置完成
private static String[] delayStateArr = {"1", "2"};//1,超时，2未超时
+ @Autowired
+ private ICommonPermissionService permissionService;
+
public String numberFormat(float floatNum) {
NumberFormat nf = NumberFormat.getPercentInstance();
nf.setMinimumFractionDigits(2);
@@ -48,32 +54,32 @@
if ("lastCheckNum".equals(caseType)) {
caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId);
} else if ("currentCheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId);
} else if ("checkedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId);
} else if ("delayCheckedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId);
} else if ("delayUncheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId);
} else if ("redoNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId);
+ caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId);
}
- for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){
+ for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
- caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())?
- sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-");
+ caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ?
+ sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-");
} catch (ParseException e) {
e.printStackTrace();
}
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) {
caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) {
caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
@@ -294,10 +300,10 @@
@Override
public List highCaseEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
- List highEventDTOList = this.baseMapper.highCaseEventList(beg,end);
- for(HighEventDTO highEventDTO:highEventDTOList){
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ List highEventDTOList = this.baseMapper.highCaseEventList(beg, end);
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
@@ -310,26 +316,26 @@
public List highEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList();
- List highEventDTOList = this.baseMapper.highEventList(beg,end);
+ List highEventDTOList = this.baseMapper.highEventList(beg, end);
HighEventDTO highEventTotalDTO = new HighEventDTO();
highEventTotalDTO.setEorc("合计");
highEventTotalDTO.setCaseType("-/-");
- long totalSum=0;
- for(HighEventDTO highEventDTO:highEventDTOList){
- totalSum=totalSum+highEventDTO.getCaseNum();
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ long totalSum = 0;
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ totalSum = totalSum + highEventDTO.getCaseNum();
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) {
highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
}
- highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType());
+ highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType());
}
highEventTotalDTO.setCaseNum(totalSum);
highEventDTOList.add(highEventTotalDTO);
@@ -338,28 +344,33 @@
@Override
public List sourceList(String beg, String end) {
- List sourceDictList=this.baseMapper.sourceDictList();
- List sourceList=this.baseMapper.sourceList(beg,end);
+ List dictList = permissionService.findInDictByCode("caseSource");
+ List sourceDictList = new ArrayList<>();
+ for (Dict dict : dictList) {
+ sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode()));
+ }
+// List sourceDictList = this.baseMapper.sourceDictList();
+ List sourceList = this.baseMapper.sourceList(beg, end);
CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO();
caseSourceTotalDTO.setCaseSource("--");
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- for(CaseSourceDTO sourceDTO:sourceList){
- if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){
- if("1".equals(sourceDTO.getEorc())){
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ for (CaseSourceDTO sourceDTO : sourceList) {
+ if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) {
+ if ("1".equals(sourceDTO.getEorc())) {
caseSourceDTO.setEventNum(sourceDTO.getCaseNum());
- }else if("2".equals(sourceDTO.getEorc())){
+ } else if ("2".equals(sourceDTO.getEorc())) {
caseSourceDTO.setComponentNum(sourceDTO.getCaseNum());
}
}
}
}
- long caseNumSum=0,componentNumSum=0,eventNumSum=0;
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum());
- caseNumSum=caseNumSum+caseSourceDTO.getCaseNum();
- componentNumSum=componentNumSum+caseSourceDTO.getComponentNum();
- eventNumSum=eventNumSum+caseSourceDTO.getEventNum();
+ long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0;
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum());
+ caseNumSum = caseNumSum + caseSourceDTO.getCaseNum();
+ componentNumSum = componentNumSum + caseSourceDTO.getComponentNum();
+ eventNumSum = eventNumSum + caseSourceDTO.getEventNum();
}
caseSourceTotalDTO.setCaseNum(caseNumSum);
caseSourceTotalDTO.setComponentNum(componentNumSum);
diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml
index 07ef694..c2d7338 100644
--- a/casic-service-cws/casic-cws-case/pom.xml
+++ b/casic-service-cws/casic-cws-case/pom.xml
@@ -26,6 +26,11 @@
casic-admin-support
${admin.version}
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index ee36630..672cfd2 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -1,12 +1,14 @@
package com.casic.missiles.modular.cwscase.controller;
import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageInfoBT;
import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum;
import com.casic.missiles.modular.cwscase.model.*;
import com.casic.missiles.modular.enums.CaseLevelEnum;
@@ -20,20 +22,26 @@
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import org.springframework.web.bind.annotation.RestController;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.casic.missiles.modular.cwscase.service.ICwsCaseService;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 控制器
@@ -44,7 +52,7 @@
//@Controller
@RestController
@RequestMapping("/case")
-public class CwsCaseController extends BaseController {
+public class CwsCaseController extends ExportController {
@Autowired
@@ -68,6 +76,10 @@
@Autowired
private ICaseFlowService caseFlowService;
+ @Value("${casic.office.maxRowsExcel}")
+ private int maxRowsExcel;
+ @Value("${casic.config.config-path}")
+ private String templatePath;
/**
* 获取列表
*/
@@ -695,8 +707,8 @@
*/
@RequestMapping(value = "/isCriticalListPage")
@ResponseBody
- public Object isCriticalListPage(String isSupervise) {
- QueryCondition queryCondition = new QueryCondition();
+ public Object isCriticalListPage(QueryCondition queryCondition, String isSupervise) {
+// QueryCondition queryCondition = new QueryCondition();
//紧急案卷
queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
@@ -883,4 +895,109 @@
return super.packForBT(page);
}
+
+
+ /**
+ * 综合查询导出
+ */
+ @RequestMapping(value = "/export")
+// @ResponseBody
+ public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException {
+ int specialQuery =0;
+ specialQuery= queryCondition.getSpecialQuery();
+ if(specialQuery>0) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = formatter.format(new Date());
+ if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+ //未超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("0");
+ } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
+ //超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
+ //超期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
+ //按期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("0");
+ }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
+ //未结案
+ queryCondition.setIsClose("0");
+ }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
+ //已立案
+ queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
+ //queryCondition.setRegisterTimeEnd(today);
+ }
+ }
+
+ List> results = queryExportByCondition(queryCondition);
+ FileInputStream fileInputStream = null;
+ if (ToolUtil.isEmpty(results)) {
+ fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+ } else {
+ fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+ }
+
+ try {
+ httpServletResponse.setContentType("application/octet-stream");
+ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
+
+ Map var = new HashMap<>();
+ var.put("标题", "案卷综合查询一览表");
+ var.put("list", results);
+ ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ httpServletResponse.getOutputStream().flush();
+ httpServletResponse.getOutputStream().close();
+ fileInputStream.close();
+ }
+ }
+
+
+ public List> queryExportByCondition(QueryCondition queryCondition){
+ List> results = null;
+ Page> page = new PageFactory>().defaultPage();
+ page.setLimit(maxRowsExcel);
+ page.setSize(maxRowsExcel);
+ page.setOffset(0);
+ page.setSearchCount(false);
+ DataScope dataScope =null;
+ try {
+ if (queryCondition.isDataScope() == true) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ else {
+ String isRevisit = queryCondition.getIsRevisit();
+ String isOvertime = queryCondition.getIsOvertime();
+ String caseLevel = queryCondition.getCaseLevel();
+
+ //回访、超时、紧急案件的查询需要判断是否有数据权限
+ if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ List roles = shiroUser.getRoleTips();
+ if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ }
+ }
+ }
+ catch (Exception e){
+ String mes = e.getMessage().toString();
+ }
+ results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+ new CwsCaseWarpper(results).warp();
+ return results;
+ }
+
}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index bccd41b..6a891bb 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -280,9 +280,16 @@
+
+ com.casic
+ casic-server
+ ${pro.version}
+
org.springframework.boot
@@ -231,11 +236,11 @@
groovy-all
true
-
- com.oracle
- ojdbc6
- ${oracle.version}
-
+
+
+
+
+
diff --git a/casic-web/src/main/resources/config/temp/caseRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/caseRecTemplate.xlsx
new file mode 100644
index 0000000..4633e3a
--- /dev/null
+++ b/casic-web/src/main/resources/config/temp/caseRecTemplate.xlsx
Binary files differ
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
new file mode 100644
index 0000000..45d0d45
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.service;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 地图服务配置表 服务类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface IDcmMapConfigService extends IService {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
new file mode 100644
index 0000000..9301ccf
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.map.service.impl;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.dao.DcmMapConfigMapper;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图服务配置表 服务实现类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@Service
+public class DcmMapConfigServiceImpl extends ServiceImpl implements IDcmMapConfigService {
+
+}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
index c6dadbb..2d8d20b 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
@@ -40,5 +40,11 @@
private String eorc;
+ public CaseSourceDTO() {
+ }
+ public CaseSourceDTO(String caseSource, String caseCode) {
+ this.caseSource = caseSource;
+ this.caseCode = caseCode;
+ }
}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
index 704398e..d77606d 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper;
import com.casic.missiles.modular.assess.dto.*;
import com.casic.missiles.modular.assess.model.DepartmentAssessFactor;
import com.casic.missiles.modular.assess.service.IDepartmentAssessService;
+import com.casic.missiles.modular.system.model.Dict;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.NumberFormat;
@@ -30,6 +33,9 @@
private static String[] checkStateArr = {"1", "2"};//1,处置中，2处置完成
private static String[] delayStateArr = {"1", "2"};//1,超时，2未超时
+ @Autowired
+ private ICommonPermissionService permissionService;
+
public String numberFormat(float floatNum) {
NumberFormat nf = NumberFormat.getPercentInstance();
nf.setMinimumFractionDigits(2);
@@ -48,32 +54,32 @@
if ("lastCheckNum".equals(caseType)) {
caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId);
} else if ("currentCheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId);
} else if ("checkedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId);
} else if ("delayCheckedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId);
} else if ("delayUncheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId);
} else if ("redoNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId);
+ caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId);
}
- for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){
+ for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
- caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())?
- sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-");
+ caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ?
+ sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-");
} catch (ParseException e) {
e.printStackTrace();
}
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) {
caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) {
caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
@@ -294,10 +300,10 @@
@Override
public List highCaseEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
- List highEventDTOList = this.baseMapper.highCaseEventList(beg,end);
- for(HighEventDTO highEventDTO:highEventDTOList){
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ List highEventDTOList = this.baseMapper.highCaseEventList(beg, end);
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
@@ -310,26 +316,26 @@
public List highEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList();
- List highEventDTOList = this.baseMapper.highEventList(beg,end);
+ List highEventDTOList = this.baseMapper.highEventList(beg, end);
HighEventDTO highEventTotalDTO = new HighEventDTO();
highEventTotalDTO.setEorc("合计");
highEventTotalDTO.setCaseType("-/-");
- long totalSum=0;
- for(HighEventDTO highEventDTO:highEventDTOList){
- totalSum=totalSum+highEventDTO.getCaseNum();
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ long totalSum = 0;
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ totalSum = totalSum + highEventDTO.getCaseNum();
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) {
highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
}
- highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType());
+ highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType());
}
highEventTotalDTO.setCaseNum(totalSum);
highEventDTOList.add(highEventTotalDTO);
@@ -338,28 +344,33 @@
@Override
public List sourceList(String beg, String end) {
- List sourceDictList=this.baseMapper.sourceDictList();
- List sourceList=this.baseMapper.sourceList(beg,end);
+ List dictList = permissionService.findInDictByCode("caseSource");
+ List sourceDictList = new ArrayList<>();
+ for (Dict dict : dictList) {
+ sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode()));
+ }
+// List sourceDictList = this.baseMapper.sourceDictList();
+ List sourceList = this.baseMapper.sourceList(beg, end);
CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO();
caseSourceTotalDTO.setCaseSource("--");
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- for(CaseSourceDTO sourceDTO:sourceList){
- if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){
- if("1".equals(sourceDTO.getEorc())){
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ for (CaseSourceDTO sourceDTO : sourceList) {
+ if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) {
+ if ("1".equals(sourceDTO.getEorc())) {
caseSourceDTO.setEventNum(sourceDTO.getCaseNum());
- }else if("2".equals(sourceDTO.getEorc())){
+ } else if ("2".equals(sourceDTO.getEorc())) {
caseSourceDTO.setComponentNum(sourceDTO.getCaseNum());
}
}
}
}
- long caseNumSum=0,componentNumSum=0,eventNumSum=0;
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum());
- caseNumSum=caseNumSum+caseSourceDTO.getCaseNum();
- componentNumSum=componentNumSum+caseSourceDTO.getComponentNum();
- eventNumSum=eventNumSum+caseSourceDTO.getEventNum();
+ long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0;
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum());
+ caseNumSum = caseNumSum + caseSourceDTO.getCaseNum();
+ componentNumSum = componentNumSum + caseSourceDTO.getComponentNum();
+ eventNumSum = eventNumSum + caseSourceDTO.getEventNum();
}
caseSourceTotalDTO.setCaseNum(caseNumSum);
caseSourceTotalDTO.setComponentNum(componentNumSum);
diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml
index 07ef694..c2d7338 100644
--- a/casic-service-cws/casic-cws-case/pom.xml
+++ b/casic-service-cws/casic-cws-case/pom.xml
@@ -26,6 +26,11 @@
casic-admin-support
${admin.version}
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index ee36630..672cfd2 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -1,12 +1,14 @@
package com.casic.missiles.modular.cwscase.controller;
import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageInfoBT;
import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum;
import com.casic.missiles.modular.cwscase.model.*;
import com.casic.missiles.modular.enums.CaseLevelEnum;
@@ -20,20 +22,26 @@
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import org.springframework.web.bind.annotation.RestController;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.casic.missiles.modular.cwscase.service.ICwsCaseService;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 控制器
@@ -44,7 +52,7 @@
//@Controller
@RestController
@RequestMapping("/case")
-public class CwsCaseController extends BaseController {
+public class CwsCaseController extends ExportController {
@Autowired
@@ -68,6 +76,10 @@
@Autowired
private ICaseFlowService caseFlowService;
+ @Value("${casic.office.maxRowsExcel}")
+ private int maxRowsExcel;
+ @Value("${casic.config.config-path}")
+ private String templatePath;
/**
* 获取列表
*/
@@ -695,8 +707,8 @@
*/
@RequestMapping(value = "/isCriticalListPage")
@ResponseBody
- public Object isCriticalListPage(String isSupervise) {
- QueryCondition queryCondition = new QueryCondition();
+ public Object isCriticalListPage(QueryCondition queryCondition, String isSupervise) {
+// QueryCondition queryCondition = new QueryCondition();
//紧急案卷
queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
@@ -883,4 +895,109 @@
return super.packForBT(page);
}
+
+
+ /**
+ * 综合查询导出
+ */
+ @RequestMapping(value = "/export")
+// @ResponseBody
+ public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException {
+ int specialQuery =0;
+ specialQuery= queryCondition.getSpecialQuery();
+ if(specialQuery>0) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = formatter.format(new Date());
+ if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+ //未超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("0");
+ } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
+ //超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
+ //超期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
+ //按期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("0");
+ }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
+ //未结案
+ queryCondition.setIsClose("0");
+ }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
+ //已立案
+ queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
+ //queryCondition.setRegisterTimeEnd(today);
+ }
+ }
+
+ List> results = queryExportByCondition(queryCondition);
+ FileInputStream fileInputStream = null;
+ if (ToolUtil.isEmpty(results)) {
+ fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+ } else {
+ fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+ }
+
+ try {
+ httpServletResponse.setContentType("application/octet-stream");
+ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
+
+ Map var = new HashMap<>();
+ var.put("标题", "案卷综合查询一览表");
+ var.put("list", results);
+ ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ httpServletResponse.getOutputStream().flush();
+ httpServletResponse.getOutputStream().close();
+ fileInputStream.close();
+ }
+ }
+
+
+ public List> queryExportByCondition(QueryCondition queryCondition){
+ List> results = null;
+ Page> page = new PageFactory>().defaultPage();
+ page.setLimit(maxRowsExcel);
+ page.setSize(maxRowsExcel);
+ page.setOffset(0);
+ page.setSearchCount(false);
+ DataScope dataScope =null;
+ try {
+ if (queryCondition.isDataScope() == true) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ else {
+ String isRevisit = queryCondition.getIsRevisit();
+ String isOvertime = queryCondition.getIsOvertime();
+ String caseLevel = queryCondition.getCaseLevel();
+
+ //回访、超时、紧急案件的查询需要判断是否有数据权限
+ if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ List roles = shiroUser.getRoleTips();
+ if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ }
+ }
+ }
+ catch (Exception e){
+ String mes = e.getMessage().toString();
+ }
+ results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+ new CwsCaseWarpper(results).warp();
+ return results;
+ }
+
}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index bccd41b..6a891bb 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -280,9 +280,16 @@
+
+ com.casic
+ casic-server
+ ${pro.version}
+
org.springframework.boot
@@ -231,11 +236,11 @@
groovy-all
true
-
- com.oracle
- ojdbc6
- ${oracle.version}
-
+
+
+
+
+
diff --git a/casic-web/src/main/resources/config/temp/caseRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/caseRecTemplate.xlsx
new file mode 100644
index 0000000..4633e3a
--- /dev/null
+++ b/casic-web/src/main/resources/config/temp/caseRecTemplate.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/processes/dcms_case_process_test.bpmn b/casic-web/src/main/resources/processes/dcms_case_process_test.bpmn
new file mode 100644
index 0000000..a8e7195
--- /dev/null
+++ b/casic-web/src/main/resources/processes/dcms_case_process_test.bpmn
@@ -0,0 +1,912 @@
+
+
+
+
+
+
+
+
+
+
+ usertask1
+ usertask4
+ usertask22
+ inclusivegateway1
+
+
+ usertask2
+ usertask3
+ usertask5
+ usertask6
+ usertask21
+ usertask23
+ exclusivegateway1
+ usertask27
+
+
+ usertask7
+ usertask8
+ usertask9
+ usertask10
+ usertask11
+ usertask20
+ usertask26
+ inclusivegateway3
+
+
+ usertask12
+ usertask14
+ usertask15
+ usertask16
+ usertask18
+ inclusivegateway2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =10}]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
new file mode 100644
index 0000000..df2f2eb
--- /dev/null
+++ b/casic-server/pom.xml
@@ -0,0 +1,91 @@
+
+
+ 4.0.0
+
+ com.casic
+ casic-smartcity-dcms-cr
+ 1.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ casic-server
+ ${pro.version}
+ jar
+ casic-server
+ 基础资源子系统
+
+
+
+
+
+ com.casic
+ casic-core
+ ${core.version}
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
+
+
+ com.casic
+ casic-admin-support
+ ${admin.version}
+
+
+ com.casic
+ casic-service-support
+ ${pro.version}
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-validation
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
new file mode 100644
index 0000000..4c5ba1e
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/controller/DcmMapConfigController.java
@@ -0,0 +1,58 @@
+package com.casic.missiles.modular.map.controller;
+
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import java.util.List;
+import com.casic.missiles.core.common.constant.factory.PageFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+
+/**
+ * 控制器
+ *
+ * @author dev
+ * @Date 2021-03-04 09:58:10
+ */
+@Controller
+@RequestMapping("/map/server")
+public class DcmMapConfigController extends BaseController {
+
+ @Autowired
+ private IDcmMapConfigService dcmMapConfigService;
+
+
+ @RequestMapping("/listPage")
+ @ResponseBody
+ public Object listPage(){
+ Page page = new PageFactory().defaultPage();
+ page = dcmMapConfigService.selectPage(page);
+ return ResponseData.success(super.packForBT(page));
+ }
+
+ @RequestMapping("/edit")
+ @ResponseBody
+ public Object edit(Long id,String url){
+ if(ToolUtil.isEmpty(url)){
+ return ResponseData.error("服务地址不能为空");
+ }
+
+ DcmMapConfig config = dcmMapConfigService.selectById(id);
+ if(ToolUtil.isEmpty(config)){
+ return ResponseData.error("服务ID不存在");
+ }
+
+ config.setUrl(url);
+ dcmMapConfigService.updateById(config);
+ return ResponseData.success();
+ }
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
new file mode 100644
index 0000000..32f508b
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/DcmMapConfigMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.dao;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ *
+ * 地图服务配置表 Mapper 接口
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface DcmMapConfigMapper extends BaseMapper {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
new file mode 100644
index 0000000..880d22c
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/dao/mapping/DcmMapConfigMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, URL AS url
+
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
new file mode 100644
index 0000000..8645950
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/model/DcmMapConfig.java
@@ -0,0 +1,78 @@
+package com.casic.missiles.modular.map.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ *
+ * 地图服务配置表
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@TableName("dcm_map_config")
+public class DcmMapConfig extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId("ID")
+ private Long id;
+ /**
+ * 服务名称
+ */
+ @TableField("NAME")
+ private String name;
+ /**
+ * 服务地址
+ */
+ @TableField("URL")
+ private String url;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DcmMapConfig{" +
+ "id=" + id +
+ ", name=" + name +
+ ", url=" + url +
+ "}";
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
new file mode 100644
index 0000000..45d0d45
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/IDcmMapConfigService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.modular.map.service;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ *
+ * 地图服务配置表 服务类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+public interface IDcmMapConfigService extends IService {
+
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
new file mode 100644
index 0000000..9301ccf
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/map/service/impl/DcmMapConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.map.service.impl;
+
+import com.casic.missiles.modular.map.model.DcmMapConfig;
+import com.casic.missiles.modular.map.dao.DcmMapConfigMapper;
+import com.casic.missiles.modular.map.service.IDcmMapConfigService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 地图服务配置表 服务实现类
+ *
+ *
+ * @author zhangyingjie123
+ * @since 2021-03-04
+ */
+@Service
+public class DcmMapConfigServiceImpl extends ServiceImpl implements IDcmMapConfigService {
+
+}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
index c6dadbb..2d8d20b 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/dto/CaseSourceDTO.java
@@ -40,5 +40,11 @@
private String eorc;
+ public CaseSourceDTO() {
+ }
+ public CaseSourceDTO(String caseSource, String caseCode) {
+ this.caseSource = caseSource;
+ this.caseCode = caseCode;
+ }
}
diff --git a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
index 704398e..d77606d 100644
--- a/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
+++ b/casic-service-assess/src/main/java/com/casic/missiles/modular/assess/service/impl/DepartmentAccessServiceImpl.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.modular.assess.dao.DepartmentAssessMapper;
import com.casic.missiles.modular.assess.dto.*;
import com.casic.missiles.modular.assess.model.DepartmentAssessFactor;
import com.casic.missiles.modular.assess.service.IDepartmentAssessService;
+import com.casic.missiles.modular.system.model.Dict;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.NumberFormat;
@@ -30,6 +33,9 @@
private static String[] checkStateArr = {"1", "2"};//1,处置中，2处置完成
private static String[] delayStateArr = {"1", "2"};//1,超时，2未超时
+ @Autowired
+ private ICommonPermissionService permissionService;
+
public String numberFormat(float floatNum) {
NumberFormat nf = NumberFormat.getPercentInstance();
nf.setMinimumFractionDigits(2);
@@ -48,32 +54,32 @@
if ("lastCheckNum".equals(caseType)) {
caseAssessDTOList = this.baseMapper.lastUnchecklistDetail(page, beg, end, depId);
} else if ("currentCheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,null,null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, null, null, depId);
} else if ("checkedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],null,depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], null, depId);
} else if ("delayCheckedNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[1],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[1], delayStateArr[0], depId);
} else if ("delayUncheckNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.checklistDetail(page,beg, end,checkStateArr[0],delayStateArr[0],depId);
+ caseAssessDTOList = this.baseMapper.checklistDetail(page, beg, end, checkStateArr[0], delayStateArr[0], depId);
} else if ("redoNum".equals(caseType)) {
- caseAssessDTOList=this.baseMapper.redolistDetail(page,beg, end,depId);
+ caseAssessDTOList = this.baseMapper.redolistDetail(page, beg, end, depId);
}
- for(CaseAssessDTO caseAssessDTO:caseAssessDTOList){
+ for (CaseAssessDTO caseAssessDTO : caseAssessDTOList) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
- caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime())?
- sdf.format(sdf.parse(caseAssessDTO.getNodeTime())):"-");
+ caseAssessDTO.setNodeTime(StringUtils.isNotBlank(caseAssessDTO.getNodeTime()) ?
+ sdf.format(sdf.parse(caseAssessDTO.getNodeTime())) : "-");
} catch (ParseException e) {
e.printStackTrace();
}
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())){
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeCode())) {
caseAssessDTO.setCaseMajorcategory(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(caseAssessDTO.getCaseTypeDetailCode())) {
caseAssessDTO.setCaseSubcategory(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
@@ -294,10 +300,10 @@
@Override
public List highCaseEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
- List highEventDTOList = this.baseMapper.highCaseEventList(beg,end);
- for(HighEventDTO highEventDTO:highEventDTOList){
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ List highEventDTOList = this.baseMapper.highCaseEventList(beg, end);
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
@@ -310,26 +316,26 @@
public List highEventList(String beg, String end) {
List caseTypeDTOList = this.baseMapper.caseTypeList();
List caseTypeDetailDTOList = this.baseMapper.caseTypeDetailList();
- List highEventDTOList = this.baseMapper.highEventList(beg,end);
+ List highEventDTOList = this.baseMapper.highEventList(beg, end);
HighEventDTO highEventTotalDTO = new HighEventDTO();
highEventTotalDTO.setEorc("合计");
highEventTotalDTO.setCaseType("-/-");
- long totalSum=0;
- for(HighEventDTO highEventDTO:highEventDTOList){
- totalSum=totalSum+highEventDTO.getCaseNum();
- for(CaseTypeDTO caseTypeDTO:caseTypeDTOList){
- if(caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())){
+ long totalSum = 0;
+ for (HighEventDTO highEventDTO : highEventDTOList) {
+ totalSum = totalSum + highEventDTO.getCaseNum();
+ for (CaseTypeDTO caseTypeDTO : caseTypeDTOList) {
+ if (caseTypeDTO.getCaseTypeCode().equals(highEventDTO.getCaseMajorType())) {
highEventDTO.setCaseMajorType(caseTypeDTO.getCaseMajorcategoryName());
break;
}
}
- for(CaseTypeDTO caseTypeDetailDTO:caseTypeDetailDTOList){
- if(caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())){
+ for (CaseTypeDTO caseTypeDetailDTO : caseTypeDetailDTOList) {
+ if (caseTypeDetailDTO.getCaseTypeCode().equals(highEventDTO.getCaseSubType())) {
highEventDTO.setCaseSubType(caseTypeDetailDTO.getCaseSubcategoryName());
break;
}
}
- highEventDTO.setCaseType(highEventDTO.getCaseMajorType()+"/"+highEventDTO.getCaseSubType());
+ highEventDTO.setCaseType(highEventDTO.getCaseMajorType() + "/" + highEventDTO.getCaseSubType());
}
highEventTotalDTO.setCaseNum(totalSum);
highEventDTOList.add(highEventTotalDTO);
@@ -338,28 +344,33 @@
@Override
public List sourceList(String beg, String end) {
- List sourceDictList=this.baseMapper.sourceDictList();
- List sourceList=this.baseMapper.sourceList(beg,end);
+ List dictList = permissionService.findInDictByCode("caseSource");
+ List sourceDictList = new ArrayList<>();
+ for (Dict dict : dictList) {
+ sourceDictList.add(new CaseSourceDTO(dict.getName(), dict.getCode()));
+ }
+// List sourceDictList = this.baseMapper.sourceDictList();
+ List sourceList = this.baseMapper.sourceList(beg, end);
CaseSourceDTO caseSourceTotalDTO = new CaseSourceDTO();
caseSourceTotalDTO.setCaseSource("--");
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- for(CaseSourceDTO sourceDTO:sourceList){
- if(caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())){
- if("1".equals(sourceDTO.getEorc())){
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ for (CaseSourceDTO sourceDTO : sourceList) {
+ if (caseSourceDTO.getCaseCode().equals(sourceDTO.getCaseCode())) {
+ if ("1".equals(sourceDTO.getEorc())) {
caseSourceDTO.setEventNum(sourceDTO.getCaseNum());
- }else if("2".equals(sourceDTO.getEorc())){
+ } else if ("2".equals(sourceDTO.getEorc())) {
caseSourceDTO.setComponentNum(sourceDTO.getCaseNum());
}
}
}
}
- long caseNumSum=0,componentNumSum=0,eventNumSum=0;
- for(CaseSourceDTO caseSourceDTO:sourceDictList){
- caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum()+caseSourceDTO.getEventNum());
- caseNumSum=caseNumSum+caseSourceDTO.getCaseNum();
- componentNumSum=componentNumSum+caseSourceDTO.getComponentNum();
- eventNumSum=eventNumSum+caseSourceDTO.getEventNum();
+ long caseNumSum = 0, componentNumSum = 0, eventNumSum = 0;
+ for (CaseSourceDTO caseSourceDTO : sourceDictList) {
+ caseSourceDTO.setCaseNum(caseSourceDTO.getComponentNum() + caseSourceDTO.getEventNum());
+ caseNumSum = caseNumSum + caseSourceDTO.getCaseNum();
+ componentNumSum = componentNumSum + caseSourceDTO.getComponentNum();
+ eventNumSum = eventNumSum + caseSourceDTO.getEventNum();
}
caseSourceTotalDTO.setCaseNum(caseNumSum);
caseSourceTotalDTO.setComponentNum(componentNumSum);
diff --git a/casic-service-cws/casic-cws-case/pom.xml b/casic-service-cws/casic-cws-case/pom.xml
index 07ef694..c2d7338 100644
--- a/casic-service-cws/casic-cws-case/pom.xml
+++ b/casic-service-cws/casic-cws-case/pom.xml
@@ -26,6 +26,11 @@
casic-admin-support
${admin.version}
+
+ com.casic
+ casic-export-support
+ ${admin.version}
+
com.casic
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
index f405351..6a08802 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CasedetailController.java
@@ -113,6 +113,30 @@
return ResponseData.success();
}
+
+ /**
+ * 催办意见提交接口
+ */
+ @RequestMapping(value = "/updateUrgeRemarks")
+ @ResponseBody
+ public Object updateUrgeRemarks(Long id,String urgeRemarks) {
+ Casedetail casedetail = casedetailService.selectById(id);
+
+ //催办人
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ casedetail.setUrgeUserid(shiroUser.getId());
+ //催办意见
+ casedetail.setUrgeRemarks(urgeRemarks);
+ casedetailService.updateById(casedetail);
+
+ //更新status表
+ Status status = statusService.selectById(id);
+ status.setIsUrge(1);
+ statusService.updateById(status);
+
+ return ResponseData.success();
+ }
+
/**
* 回访记录更新接口
*/
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
index ee36630..672cfd2 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java
@@ -1,12 +1,14 @@
package com.casic.missiles.modular.cwscase.controller;
import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.base.response.ResponseData;
import com.casic.missiles.core.common.constant.factory.PageFactory;
import com.casic.missiles.core.common.service.ICommonPermissionService;
import com.casic.missiles.core.datascope.DataScope;
import com.casic.missiles.core.page.PageInfoBT;
import com.casic.missiles.core.shiro.ShiroUser;
+import com.casic.missiles.core.util.ToolUtil;
import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum;
import com.casic.missiles.modular.cwscase.model.*;
import com.casic.missiles.modular.enums.CaseLevelEnum;
@@ -20,20 +22,26 @@
import com.casic.missiles.modular.flowable.service.ICaseFlowService;
import com.casic.missiles.modular.system.model.Dict;
import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import org.springframework.web.bind.annotation.RestController;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.casic.missiles.modular.cwscase.service.ICwsCaseService;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 控制器
@@ -44,7 +52,7 @@
//@Controller
@RestController
@RequestMapping("/case")
-public class CwsCaseController extends BaseController {
+public class CwsCaseController extends ExportController {
@Autowired
@@ -68,6 +76,10 @@
@Autowired
private ICaseFlowService caseFlowService;
+ @Value("${casic.office.maxRowsExcel}")
+ private int maxRowsExcel;
+ @Value("${casic.config.config-path}")
+ private String templatePath;
/**
* 获取列表
*/
@@ -695,8 +707,8 @@
*/
@RequestMapping(value = "/isCriticalListPage")
@ResponseBody
- public Object isCriticalListPage(String isSupervise) {
- QueryCondition queryCondition = new QueryCondition();
+ public Object isCriticalListPage(QueryCondition queryCondition, String isSupervise) {
+// QueryCondition queryCondition = new QueryCondition();
//紧急案卷
queryCondition.setCaseLevel(String.valueOf(CaseLevelEnum.EMERGENT.getState()));
@@ -883,4 +895,109 @@
return super.packForBT(page);
}
+
+
+ /**
+ * 综合查询导出
+ */
+ @RequestMapping(value = "/export")
+// @ResponseBody
+ public void export(QueryCondition queryCondition,HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse)throws IOException {
+ int specialQuery =0;
+ specialQuery= queryCondition.getSpecialQuery();
+ if(specialQuery>0) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = formatter.format(new Date());
+ if (specialQuery == SpecialQueryEnum.NO_EXCEED_NO_HANDLE.getState()) {
+ //未超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("0");
+ } else if (specialQuery == SpecialQueryEnum.EXCEED_NO_HANDLE.getState()){
+ //超期未处置
+ queryCondition.setProcessState("1");//处置中
+ queryCondition.setIsOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.EXCEED_HANDLE.getState()){
+ //超期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("1");
+ }else if(specialQuery == SpecialQueryEnum.ON_TIME_HANDLE.getState()){
+ //按期处置
+ queryCondition.setProcessState("2");//处置完成
+ queryCondition.setIsProcessOvertime("0");
+ }else if(specialQuery == SpecialQueryEnum.NO_CLOSE.getState()){
+ //未结案
+ queryCondition.setIsClose("0");
+ }else if(specialQuery == SpecialQueryEnum.REGISTERED.getState()){
+ //已立案
+ queryCondition.setEbCaseState(EbCaseStateEnum.EFFECTIVE_FILINGCASE.getState()+"");
+ //queryCondition.setRegisterTimeEnd(today);
+ }
+ }
+
+ List> results = queryExportByCondition(queryCondition);
+ FileInputStream fileInputStream = null;
+ if (ToolUtil.isEmpty(results)) {
+ fileInputStream = new FileInputStream(templatePath + "/accessEmpty.xlsx");
+ } else {
+ fileInputStream = new FileInputStream(templatePath + "/caseRecTemplate.xlsx");
+ }
+
+ try {
+ httpServletResponse.setContentType("application/octet-stream");
+ httpServletResponse.addHeader("Content-Disposition", " attachment;filename=" + "caseRecTemplate.xlsx");
+
+ Map var = new HashMap<>();
+ var.put("标题", "案卷综合查询一览表");
+ var.put("list", results);
+ ExcelIO.writeTemplate(fileInputStream, httpServletResponse.getOutputStream(), var);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ httpServletResponse.getOutputStream().flush();
+ httpServletResponse.getOutputStream().close();
+ fileInputStream.close();
+ }
+ }
+
+
+ public List> queryExportByCondition(QueryCondition queryCondition){
+ List> results = null;
+ Page> page = new PageFactory>().defaultPage();
+ page.setLimit(maxRowsExcel);
+ page.setSize(maxRowsExcel);
+ page.setOffset(0);
+ page.setSearchCount(false);
+ DataScope dataScope =null;
+ try {
+ if (queryCondition.isDataScope() == true) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ else {
+ String isRevisit = queryCondition.getIsRevisit();
+ String isOvertime = queryCondition.getIsOvertime();
+ String caseLevel = queryCondition.getCaseLevel();
+
+ //回访、超时、紧急案件的查询需要判断是否有数据权限
+ if ((isRevisit != null && isRevisit.equals("1"))|| (isOvertime != null && isOvertime.equals("1"))|| (caseLevel != null && caseLevel.equals("1"))) {
+ ShiroUser shiroUser = service.getCurrLoginUser();
+ List roles = shiroUser.getRoleTips();
+ if (roles.contains(CwsRoleEnums.TWOLEVEL.getRoleTip())) {
+ dataScope = service.getCurrUserDataScope();
+ dataScope.setScopeName("ONEDEPTID");
+ }
+ }
+ }
+ }
+ catch (Exception e){
+ String mes = e.getMessage().toString();
+ }
+ results = cwsCaseService.queryByCondition(page,dataScope,queryCondition);
+ new CwsCaseWarpper(results).warp();
+ return results;
+ }
+
}
diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
index bccd41b..6a891bb 100644
--- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
+++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/dao/mapping/CwsCaseMapper.xml
@@ -280,9 +280,16 @@
+
+ com.casic
+ casic-server
+ ${pro.version}
+
org.springframework.boot
@@ -231,11 +236,11 @@
groovy-all
true
-
- com.oracle
- ojdbc6
- ${oracle.version}
-
+
+
+
+
+
diff --git a/casic-web/src/main/resources/config/temp/caseRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/caseRecTemplate.xlsx
new file mode 100644
index 0000000..4633e3a
--- /dev/null
+++ b/casic-web/src/main/resources/config/temp/caseRecTemplate.xlsx
Binary files differ
diff --git a/casic-web/src/main/resources/processes/dcms_case_process_test.bpmn b/casic-web/src/main/resources/processes/dcms_case_process_test.bpmn
new file mode 100644
index 0000000..a8e7195
--- /dev/null
+++ b/casic-web/src/main/resources/processes/dcms_case_process_test.bpmn
@@ -0,0 +1,912 @@
+
+
+
+
+
+
+
+
+
+
+ usertask1
+ usertask4
+ usertask22
+ inclusivegateway1
+
+
+ usertask2
+ usertask3
+ usertask5
+ usertask6
+ usertask21
+ usertask23
+ exclusivegateway1
+ usertask27
+
+
+ usertask7
+ usertask8
+ usertask9
+ usertask10
+ usertask11
+ usertask20
+ usertask26
+ inclusivegateway3
+
+
+ usertask12
+ usertask14
+ usertask15
+ usertask16
+ usertask18
+ inclusivegateway2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =10}]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index c836195..67858d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
casic-service-cws
casic-service-support
casic-service-assess
+ casic-server