Date: Wed, 4 Sep 2019 19:26:00 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=BA=A7=E8=81=94?=
=?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../elink/esua/epdc/dto/SysSimpleDeptDTO.java | 38 +++++++++++++++++++
.../epdc-admin/epdc-admin-server/pom.xml | 2 +-
.../esua/epdc/controller/AreaController.java | 21 ++++++++--
.../com/elink/esua/epdc/dao/SysDeptDao.java | 13 ++++++-
.../elink/esua/epdc/service/AreaService.java | 12 ++++++
.../epdc/service/impl/AreaServiceImpl.java | 15 ++++++++
.../src/main/resources/mapper/SysDeptDao.xml | 8 ++++
7 files changed, 103 insertions(+), 6 deletions(-)
create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDeptDTO.java
diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDeptDTO.java
new file mode 100644
index 000000000..e0f16ca82
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDeptDTO.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 简要部门信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Data
+@ApiModel(value = "部门管理")
+public class SysSimpleDeptDTO implements Serializable {
+
+ private static final long serialVersionUID = -6055457020846692183L;
+
+ /**
+ * 部门ID
+ */
+ private Long id;
+
+ /**
+ * 部门名称
+ */
+ private String name;
+
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
index 223bae618..edbeae0bf 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
@@ -84,7 +84,7 @@
dev
- true
+ false
47.104.224.45:8848
http://localhost:9411
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AreaController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AreaController.java
index 13bb88cbd..8ab8ed67a 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AreaController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/AreaController.java
@@ -1,16 +1,16 @@
package com.elink.esua.epdc.controller;
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.SimpleAreaDTO;
+import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
import com.elink.esua.epdc.service.AreaService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
@@ -39,4 +39,17 @@ public class AreaController {
return this.areaService.listSimpleAreaInfo(areaId);
}
+ /**
+ * 数据权限控制用户可操作的部门（用于下拉菜单显示）
+ *
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author yujintao
+ * @date 2019/9/4 19:21
+ */
+ @GetMapping("listSimpleDept")
+ @DataFilter(tableAlias = "temp", deptId = "id", prefix = "WHERE")
+ public Result> listSimpleDeptInfo(@RequestParam Map params) {
+ return this.areaService.listSimpleDeptInfo(params);
+ }
}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
index c16eb1e83..695c22b2c 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
@@ -8,9 +8,9 @@
package com.elink.esua.epdc.dao;
+import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
import com.elink.esua.epdc.entity.SysDeptEntity;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
-import com.elink.esua.epdc.entity.SysDeptEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -41,4 +41,15 @@ public interface SysDeptDao extends BaseDao {
List getSubDeptIdList(String id);
List getSubList(Map params);
+
+ /**
+ * 根据上级部门ID，获取下属部门简要信息列表
+ *
+ * @param params 父部门ID
+ * @return java.util.List < com.elink.esua.epdc.dto.SysSimpleDeptDTO>
+ * @author yujintao
+ * @date 2019/9/4 16:21
+ */
+ List listSimpleDeptInfo(Map params);
+
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AreaService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AreaService.java
index 72a0ce258..b5a8e0159 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AreaService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/AreaService.java
@@ -4,9 +4,11 @@ package com.elink.esua.epdc.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.SimpleAreaDTO;
+import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
import com.elink.esua.epdc.entity.AreaEntity;
import java.util.List;
+import java.util.Map;
/**
* 行政区划
@@ -26,4 +28,14 @@ public interface AreaService extends BaseService {
* @date 2019/6/13 10:35
*/
Result> listSimpleAreaInfo(String areaId);
+
+ /**
+ * 根据上级部门ID，获取下属部门简要信息列表
+ *
+ * @param params 父部门ID
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author yujintao
+ * @date 2019/9/4 16:21
+ */
+ Result> listSimpleDeptInfo(Map params);
}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AreaServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AreaServiceImpl.java
index 7bf4a8b76..8432d45a8 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AreaServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/AreaServiceImpl.java
@@ -7,7 +7,9 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dao.AreaDao;
+import com.elink.esua.epdc.dao.SysDeptDao;
import com.elink.esua.epdc.dto.SimpleAreaDTO;
+import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
import com.elink.esua.epdc.entity.AreaEntity;
import com.elink.esua.epdc.redis.AreaRedis;
import com.elink.esua.epdc.service.AreaService;
@@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
/**
@@ -32,6 +35,10 @@ public class AreaServiceImpl extends BaseServiceImpl implem
@Autowired
private AreaRedis areaRedis;
+ @Autowired
+ private SysDeptDao deptDao;
+
+
@Override
public Result> listSimpleAreaInfo(String areaId) {
@@ -62,4 +69,12 @@ public class AreaServiceImpl extends BaseServiceImpl implem
}
return new Result>().ok(simpleAreaList);
}
+
+ @Override
+ public Result> listSimpleDeptInfo(Map params) {
+
+ List sysSimpleDeptS = this.deptDao.listSimpleDeptInfo(params);
+
+ return new Result().ok(sysSimpleDeptS);
+ }
}
\ No newline at end of file
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
index 336e39112..dc5e9d705 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
@@ -31,4 +31,12 @@
select id from sys_dept where pids like #{id} and del_flag = 0
+
+
+ SELECT
+ temp.id,temp.name
+ FROM
+ ( SELECT * FROM sys_dept d WHERE d.pid = #{deptId} ) temp
+
+
From 5910a4f80fc481d59420308ab0d6af78b0afa7f9 Mon Sep 17 00:00:00 2001
From: liuchuang
Date: Wed, 4 Sep 2019 19:35:30 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86-?=
=?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epdc-events/epdc-events-client/pom.xml | 8 +
.../esua/epdc/dto/events/EpdcEventsDTO.java | 91 +++++++++++
.../epdc-events/epdc-events-server/pom.xml | 10 +-
.../controller/EpdcEventsController.java | 102 ++++++++++++
.../modules/events/dao/EpdcEventsDao.java | 33 ++++
.../events/entity/EpdcEventsEntity.java | 153 ++++++++++++++++++
.../modules/events/excel/EpdcEventsExcel.java | 81 ++++++++++
.../modules/events/redis/EpdcEventsRedis.java | 47 ++++++
.../events/service/EpdcEventsService.java | 47 ++++++
.../service/impl/EpdcEventsServiceImpl.java | 113 +++++++++++++
.../src/main/resources/application.yml | 4 +-
.../resources/mapper/events/EpdcEventsDao.xml | 6 +
12 files changed, 688 insertions(+), 7 deletions(-)
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/EpdcEventsExcel.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/redis/EpdcEventsRedis.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml
index 7e5ea539d..72ff9ae17 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml
@@ -12,5 +12,13 @@
epdc-events-client
jar
+
+
+ com.esua.epdc
+ epdc-commons-tools
+ 1.0.0
+
+
+
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java
new file mode 100644
index 000000000..14988bb40
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see elink@888
-
+
epdc
- elink888
+ elink833066
false
47.104.224.45:8848
@@ -109,10 +109,10 @@
elink@888
-
+
epdc
- elink888
+ elink833066
false
47.104.224.45:8848
@@ -132,7 +132,7 @@
elink@888
-
+
epdc
elink888
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
new file mode 100644
index 000000000..48c6d332a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ PageData page = epdcEventsService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ EpdcEventsDTO data = epdcEventsService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody EpdcEventsDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ epdcEventsService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody EpdcEventsDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ epdcEventsService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ epdcEventsService.delete(ids);
+
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = epdcEventsService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, list, EpdcEventsExcel.class);
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
new file mode 100644
index 000000000..cabc90183
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
new file mode 100644
index 000000000..c0bd0aec5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ PageData page(Map params);
+
+ List list(Map params);
+
+ EpdcEventsDTO get(String id);
+
+ void save(EpdcEventsDTO dto);
+
+ void update(EpdcEventsDTO dto);
+
+ void delete(String[] ids);
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
new file mode 100644
index 000000000..4dc2e1757
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements EpdcEventsService {
+ @Autowired
+ private EpdcEventsRedis epdcEventsRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, Constant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+
+ return getPageData(page, EpdcEventsDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, EpdcEventsDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String startTime = (String)params.get("startTime");
+ String endTime = (String)params.get("endTime");
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.between(StringUtils.isNotBlank(startTime), Constant.CREATED_TIME, startTime, endTime);
+ wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
+
+ return wrapper;
+ }
+
+ @Override
+ public EpdcEventsDTO get(String id) {
+ EpdcEventsEntity entity = baseDao.selectById(id);
+
+ return ConvertUtils.sourceToTarget(entity, EpdcEventsDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(EpdcEventsDTO dto) {
+ EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class);
+
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(EpdcEventsDTO dto) {
+ EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class);
+
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ //逻辑删除
+ //logicDelete(ids, EpdcEventsEntity.class);
+
+ //物理删除
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
index 5fbb1cb04..4216b3d4e 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
@@ -49,12 +49,12 @@ management:
mybatis-plus:
mapper-locations: classpath:/mapper/**/*.xml
#实体扫描，多个package用逗号或者分号分隔
- typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
+ typeAliasesPackage: com.elink.esua.epdc.modules.*.entity
global-config:
#数据库相关配置
db-config:
#主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
- id-type: ID_WORKER
+ id-type: UUID
#字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
field-strategy: NOT_NULL
#驼峰下划线转换
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
new file mode 100644
index 000000000..05191f8be
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
From 876dbbe09e47fcc843d967256f366d5b0e641e03 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Wed, 4 Sep 2019 19:37:11 +0800
Subject: [PATCH 06/14] bug
---
.../java/com/elink/esua/epdc/dto/UserDTO.java | 6 +++++
.../esua/epdc/controller/UserController.java | 15 +++++++++++++
.../elink/esua/epdc/service/UserService.java | 2 ++
.../epdc/service/impl/UserServiceImpl.java | 22 +++++++++++++++++++
4 files changed, 45 insertions(+)
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
index 8d241fa17..90cd8dce6 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java
@@ -155,5 +155,11 @@ public class UserDTO implements Serializable {
private String community;
private String communityId;
+ //干部下沉 0不
+ private String cadreFlag;
+ //是否通过 0不
+ private String pass;
+
+ private String tagIds;
}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
index 62690326d..5a94951cb 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dto.UserDTO;
import com.elink.esua.epdc.excel.UserExcel;
import com.elink.esua.epdc.service.UserService;
+import io.seata.spring.annotation.GlobalTransactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -81,6 +82,20 @@ public class UserController {
return new Result();
}
+ /**
+ * 审核
+ * @param dto
+ * @return
+ */
+ @PostMapping("audit")
+ public Result audit(@RequestBody UserDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ userService.audit(dto);
+
+ return new Result();
+ }
@DeleteMapping
public Result delete(@RequestBody String[] ids){
//效验数据
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
index 28e105742..8f5bd2317 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
@@ -44,4 +44,6 @@ public interface UserService extends BaseService {
void update(UserDTO dto);
void delete(String[] ids);
+
+ void audit(UserDTO dto);
}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index b32b806da..fe6a142ce 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -25,10 +25,16 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.dao.PartyMembersDao;
import com.elink.esua.epdc.dao.UserDao;
+import com.elink.esua.epdc.dto.PartyMembersDTO;
+import com.elink.esua.epdc.dto.PartyTagRelationDTO;
import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.entity.PartyMembersEntity;
import com.elink.esua.epdc.entity.UserEntity;
import com.elink.esua.epdc.redis.UserRedis;
+import com.elink.esua.epdc.service.PartyMembersService;
+import com.elink.esua.epdc.service.PartyTagRelationService;
import com.elink.esua.epdc.service.UserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +56,9 @@ public class UserServiceImpl extends BaseServiceImpl implem
@Autowired
private UserRedis userRedis;
+ @Autowired
+ private PartyMembersService partyMembersService;
+
@Override
public PageData page(Map params) {
IPage page = baseDao.selectPage(
@@ -124,4 +133,17 @@ public class UserServiceImpl extends BaseServiceImpl implem
baseDao.deleteBatchIds(Arrays.asList(ids));
}
+ @Override
+ public void audit(UserDTO dto) {
+ UserEntity entity = ConvertUtils.sourceToTarget(dto, UserEntity.class);
+ updateById(entity);
+ if("1".equals(dto.getPass())){
+ PartyMembersDTO partyMembersDTO=ConvertUtils.sourceToTarget(dto, PartyMembersDTO.class);
+ partyMembersDTO.setStreetName(dto.getStreet());
+ partyMembersDTO.setCommunityName(dto.getCommunity());
+ partyMembersDTO.setGridName(dto.getGrid());
+ partyMembersService.save(partyMembersDTO);
+ }
+ }
+
}
\ No newline at end of file
From 6f09ca4510e665e03d2c591f3a979f861690c787 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Wed, 4 Sep 2019 20:27:07 +0800
Subject: [PATCH 07/14] bug
---
.../java/com/elink/esua/epdc/service/impl/UserServiceImpl.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index fe6a142ce..b63abe334 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -76,6 +76,7 @@ public class UserServiceImpl extends BaseServiceImpl implem
}
private QueryWrapper getWrapper(Map params){
+ String auditState= (String) params.get("auditState");
String id = (String)params.get("id");
String streetId=(String) params.get("streetId");
String communityId=(String) params.get("communityId");
@@ -96,6 +97,7 @@ public class UserServiceImpl extends BaseServiceImpl implem
wrapper.eq(StringUtils.isNotBlank(identityNo),"IDENTITY_NO",identityNo);
wrapper.ge(StringUtils.isNotBlank(startTime),"REGISTER_TIME",startTime);
wrapper.lt(StringUtils.isNotBlank(endTime),"REGISTER_TIME",endTime);
+ wrapper.eq(StringUtils.isNotBlank(auditState),"STATE",auditState);
// wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
return wrapper;
}
From fe0feec00ea52b41da101c221e421e8d864aecf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?=
Date: Wed, 4 Sep 2019 20:58:56 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/elink/esua/epdc/dto/item/ItemDTO.java | 177 ++++++++++++++++++
.../item/controller/ItemController.java | 94 ++++++++++
.../esua/epdc/modules/item/dao/ItemDao.java | 33 ++++
.../epdc/modules/item/entity/ItemEntity.java | 147 +++++++++++++++
.../epdc/modules/item/excel/ItemExcel.java | 120 ++++++++++++
.../epdc/modules/item/redis/ItemRedis.java | 47 +++++
.../modules/item/service/ItemService.java | 95 ++++++++++
.../item/service/impl/ItemServiceImpl.java | 104 ++++++++++
.../main/resources/mapper/item/ItemDao.xml | 38 ++++
9 files changed, 855 insertions(+)
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemExcel.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/redis/ItemRedis.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java
new file mode 100755
index 000000000..847b2786e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java
@@ -0,0 +1,177 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ PageData page = itemService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ ItemDTO data = itemService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody ItemDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ itemService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody ItemDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ itemService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ itemService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = itemService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, ItemExcel.class);
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
new file mode 100755
index 000000000..0511d971b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
new file mode 100755
index 000000000..e766df97e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
@@ -0,0 +1,147 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author
+ * @date
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author
+ * @date
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return ItemDTO
+ * @author
+ * @date
+ */
+ ItemDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author
+ * @date
+ */
+ void save(ItemDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author
+ * @date
+ */
+ void update(ItemDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author
+ * @date
+ */
+ void delete(String[] ids);
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
new file mode 100755
index 000000000..b0671d2a2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements ItemService {
+
+ @Autowired
+ private ItemRedis itemRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, ItemDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, ItemDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public ItemDTO get(String id) {
+ ItemEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, ItemDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(ItemDTO dto) {
+ ItemEntity entity = ConvertUtils.sourceToTarget(dto, ItemEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(ItemDTO dto) {
+ ItemEntity entity = ConvertUtils.sourceToTarget(dto, ItemEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
new file mode 100755
index 000000000..61f8a3ccc
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
From 2928db4614fc87f16b6197cef42f50d203c4386e Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Thu, 5 Sep 2019 09:19:49 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E6=96=B0=E9=97=BB=E7=B1=BB=E5=88=AB?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epdc-news/epdc-news-client/pom.xml | 8 +-
.../elink/esua/epdc/dto/NewsCategoryDTO.java | 66 +++++++++++
.../epdc-news/epdc-news-server/pom.xml | 12 +-
.../controller/NewsCategoryController.java | 94 ++++++++++++++++
.../elink/esua/epdc/dao/NewsCategoryDao.java | 33 ++++++
.../esua/epdc/entity/NewsCategoryEntity.java | 61 ++++++++++
.../esua/epdc/excel/NewsCategoryExcel.java | 68 ++++++++++++
.../esua/epdc/redis/NewsCategoryRedis.java | 47 ++++++++
.../epdc/service/NewsCategoryService.java | 95 ++++++++++++++++
.../service/impl/NewsCategoryServiceImpl.java | 104 ++++++++++++++++++
.../main/resources/mapper/NewsCategoryDao.xml | 21 ++++
11 files changed, 602 insertions(+), 7 deletions(-)
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsCategoryDTO.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NewsCategoryEntity.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NewsCategoryExcel.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/redis/NewsCategoryRedis.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NewsCategoryService.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml
index 5d569d869..0b6f88f85 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml
@@ -12,5 +12,11 @@
epdc-news-client
jar
-
+
+
+ com.esua.epdc
+ epdc-commons-tools
+ 1.0.0
+
+
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsCategoryDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsCategoryDTO.java
new file mode 100644
index 000000000..316df4ede
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NewsCategoryDTO.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see elink@888
-
+
epdc
- elink888
+ elink833066
false
47.104.224.45:8848
@@ -109,10 +109,10 @@
elink@888
-
+
epdc
- elink888
+ elink833066
false
47.104.224.45:8848
@@ -132,10 +132,10 @@
elink@888
-
+
epdc
- elink888
+ elink833066
false
47.104.224.45:8848
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java
new file mode 100644
index 000000000..69a21af14
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsCategoryController.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ PageData page = newsCategoryService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ NewsCategoryDTO data = newsCategoryService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody NewsCategoryDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ newsCategoryService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody NewsCategoryDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ newsCategoryService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ newsCategoryService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = newsCategoryService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, NewsCategoryExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java
new file mode 100644
index 000000000..15d1c1718
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NewsCategoryDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NewsCategoryEntity.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NewsCategoryEntity.java
new file mode 100644
index 000000000..a8e16d956
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NewsCategoryEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author
+ * @date
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author
+ * @date
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return NewsCategoryDTO
+ * @author
+ * @date
+ */
+ NewsCategoryDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author
+ * @date
+ */
+ void save(NewsCategoryDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author
+ * @date
+ */
+ void update(NewsCategoryDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author
+ * @date
+ */
+ void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java
new file mode 100644
index 000000000..5d237b3c2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsCategoryServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements NewsCategoryService {
+
+ @Autowired
+ private NewsCategoryRedis newsCategoryRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, NewsCategoryDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, NewsCategoryDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public NewsCategoryDTO get(String id) {
+ NewsCategoryEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, NewsCategoryDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(NewsCategoryDTO dto) {
+ NewsCategoryEntity entity = ConvertUtils.sourceToTarget(dto, NewsCategoryEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(NewsCategoryDTO dto) {
+ NewsCategoryEntity entity = ConvertUtils.sourceToTarget(dto, NewsCategoryEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml
new file mode 100644
index 000000000..2fad90ac9
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From c40f7efe113a72197599ec6ad3824688e1e11755 Mon Sep 17 00:00:00 2001
From: yujintao
Date: Thu, 5 Sep 2019 09:59:05 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epdc/controller/SysDeptController.java | 9 +-
.../com/elink/esua/epdc/dao/SysDeptDao.java | 2 -
.../esua/epdc/service/SysDeptService.java | 19 ++-
.../epdc/service/impl/SysDeptServiceImpl.java | 41 +++---
.../src/main/resources/mapper/SysDeptDao.xml | 4 -
.../commons/tools/constant/FieldConstant.java | 3 +
.../epdc-news/epdc-news-client/pom.xml | 4 +
.../com/elink/esua/epdc/dto/NoticeDTO.java | 101 +++++++++++++++
.../epdc/controller/NoticeController.java | 94 ++++++++++++++
.../com/elink/esua/epdc/dao/NoticeDao.java | 33 +++++
.../elink/esua/epdc/entity/NoticeEntity.java | 73 +++++++++++
.../elink/esua/epdc/excel/NoticeExcel.java | 71 +++++++++++
.../elink/esua/epdc/redis/NoticeRedis.java | 47 +++++++
.../esua/epdc/service/NoticeService.java | 95 ++++++++++++++
.../epdc/service/impl/NoticeServiceImpl.java | 117 ++++++++++++++++++
15 files changed, 680 insertions(+), 33 deletions(-)
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NoticeController.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NoticeExcel.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/redis/NoticeRedis.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java
create mode 100644 esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
index 532511b2c..b06fb2bf5 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
@@ -16,6 +16,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
import com.elink.esua.epdc.service.SysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -49,11 +50,9 @@ public class SysDeptController {
@GetMapping("sublist/{pid}")
@ApiOperation("子列表")
- public Result> sublist(@PathVariable("pid") String pid){
- Map map = new HashMap();
- map.put("pid",pid);
- List list = sysDeptService.subList(map);
- return new Result>().ok(list);
+ public Result> sublist(@PathVariable("pid") String pid){
+ List list = sysDeptService.subList(pid);
+ return new Result().ok(list);
}
@GetMapping("{id}")
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
index 695c22b2c..17a0c6e8d 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
@@ -40,8 +40,6 @@ public interface SysDeptDao extends BaseDao {
*/
List getSubDeptIdList(String id);
- List getSubList(Map params);
-
/**
* 根据上级部门ID，获取下属部门简要信息列表
*
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
index e992eda68..b8827fbe4 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
@@ -1,13 +1,14 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
- *
+ *
* https://www.renren.io
- *
+ *
* 版权所有，侵权必究！
*/
package com.elink.esua.epdc.service;
+import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
import com.elink.esua.epdc.entity.SysDeptEntity;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.dto.SysDeptDTO;
@@ -34,12 +35,20 @@ public interface SysDeptService extends BaseService {
void delete(Long id);
- //根据pid获取下一级子列表
- List subList(Map params);
+ /**
+ * 根据部门ID，获取下属部门
+ *
+ * @param pid
+ * @return java.util.List
+ * @author
+ * @date 2019/9/4 20:54
+ */
+ List subList(String pid);
/**
* 根据部门ID，获取本部门及子部门ID列表
- * @param id 部门ID
+ *
+ * @param id 部门ID
*/
List getSubDeptIdList(Long id);
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index ef32e341d..f7d4f545e 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -1,15 +1,17 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
- *
+ *
* https://www.renren.io
- *
+ *
* 版权所有，侵权必究！
*/
package com.elink.esua.epdc.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -19,6 +21,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
import com.elink.esua.epdc.dao.SysDeptDao;
import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
import com.elink.esua.epdc.entity.SysDeptEntity;
import com.elink.esua.epdc.service.SysDeptService;
import com.elink.esua.epdc.service.SysUserService;
@@ -47,7 +50,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl list(Map params) {
//普通管理员，只能查询所属部门及子部门的数据
UserDetail user = SecurityUser.getUser();
- if(user.getSuperAdmin() == SuperAdminEnum.NO.value()) {
+ if (user.getSuperAdmin() == SuperAdminEnum.NO.value()) {
params.put("deptIdList", getSubDeptIdList(user.getDeptId()));
}
@@ -59,16 +62,19 @@ public class SysDeptServiceImpl extends BaseServiceImpl subList(Map params) {
- List entityList = baseDao.getSubList(params);
- List dtoList = ConvertUtils.sourceToTarget(entityList, SysDeptDTO.class);
- return TreeUtils.build(dtoList);
+ public List subList(String pid) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("pid", pid)
+ .select(FieldConstant.ID, FieldConstant.NAME)
+ .orderByAsc(FieldConstant.NAME);
+ List entities = this.baseDao.selectList(wrapper);
+ return ConvertUtils.sourceToTarget(entities, SysSimpleDeptDTO.class);
}
@Override
public SysDeptDTO get(Long id) {
//超级管理员，部门ID为null
- if(id == null){
+ if (id == null) {
return null;
}
@@ -92,7 +98,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl subList = getSubDeptIdList(id);
- if(subList.size() > 1){
+ if (subList.size() > 1) {
throw new RenException(ErrorCode.DEPT_SUB_DELETE_ERROR);
}
//判断部门下面是否有用户
int count = sysUserService.getCountByDeptId(id);
- if(count > 0){
+ if (count > 0) {
throw new RenException(ErrorCode.DEPT_USER_DELETE_ERROR);
}
@@ -129,11 +135,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl map = new HashMap<>(deptList.size());
- for(SysDeptEntity entity : deptList){
+ for (SysDeptEntity entity : deptList) {
map.put(entity.getId(), entity);
}
@@ -155,13 +162,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl map, List pidList) {
//顶级部门，无上级部门
- if(Constant.DEPT_ROOT.equals(pid)){
- return ;
+ if (Constant.DEPT_ROOT.equals(pid)) {
+ return;
}
//上级部门存在
SysDeptEntity parent = map.get(pid);
- if(parent != null){
+ if (parent != null) {
getPidTree(parent.getPid(), map, pidList);
}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
index dc5e9d705..60b2345ec 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
@@ -15,10 +15,6 @@
order by t1.sort asc
-
- SELECT * FROM sys_dept WHERE pid = #{pid} and del_flag = '0'
-
-
select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1
where t1.id = #{value} and t1.del_flag = 0
diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/FieldConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/FieldConstant.java
index fa72296c2..6b686071a 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/FieldConstant.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/FieldConstant.java
@@ -30,4 +30,7 @@ public interface FieldConstant {
String DEL_FLAG = "DEL_FLAG";
String DEL_FLAG_HUMP = "delFlag";
+
+ String NAME = "NAME";
+ String NAME_HUMP = "name";
}
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml
index 0b6f88f85..35f66a950 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/pom.xml
@@ -19,4 +19,8 @@
1.0.0
+
+
+ ${project.artifactId}
+
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
new file mode 100644
index 000000000..e3e21626a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ PageData page = noticeService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ NoticeDTO data = noticeService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody NoticeDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ noticeService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody NoticeDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ noticeService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ noticeService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = noticeService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, NoticeExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java
new file mode 100644
index 000000000..6a4b0e7b3
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java
new file mode 100644
index 000000000..f7c6ae639
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author
+ * @date
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author
+ * @date
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return NoticeDTO
+ * @author
+ * @date
+ */
+ NoticeDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author
+ * @date
+ */
+ void save(NoticeDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author
+ * @date
+ */
+ void update(NoticeDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author
+ * @date
+ */
+ void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
new file mode 100644
index 000000000..dbe840fc4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements NoticeService {
+
+ @Autowired
+ private NoticeRedis noticeRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, NoticeDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, NoticeDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params) {
+ String id = (String) params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public NoticeDTO get(String id) {
+ NoticeEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, NoticeDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(NoticeDTO dto) {
+
+ UserDetail user = SecurityUser.getUser();
+ if (!user.getDeptIdList().contains(dto.getDeptId())) {
+ throw new RenException("您没有操作此部门的数据权限");
+ }
+ dto.setCreatorName(user.getRealName());
+ NoticeEntity entity = ConvertUtils.sourceToTarget(dto, NoticeEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(NoticeDTO dto) {
+ UserDetail user = SecurityUser.getUser();
+ if (!user.getDeptIdList().contains(dto.getDeptId())) {
+ throw new RenException("您没有操作此部门的数据权限");
+ }
+ NoticeEntity entity = ConvertUtils.sourceToTarget(dto, NoticeEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ //物理删除
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
\ No newline at end of file
From 2d7acada4f3a084686c843547ef5a32b5ea46e1f Mon Sep 17 00:00:00 2001
From: yujintao
Date: Thu, 5 Sep 2019 10:58:35 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E5=99=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/io/renren/utils/GenUtils.java | 47 ++++++++-----------
1 file changed, 20 insertions(+), 27 deletions(-)
diff --git a/renren-cloud-generator/src/main/java/io/renren/utils/GenUtils.java b/renren-cloud-generator/src/main/java/io/renren/utils/GenUtils.java
index b88282d63..46141b46f 100644
--- a/renren-cloud-generator/src/main/java/io/renren/utils/GenUtils.java
+++ b/renren-cloud-generator/src/main/java/io/renren/utils/GenUtils.java
@@ -37,7 +37,7 @@ import java.util.zip.ZipOutputStream;
/**
* 代码生成器 工具类
- *
+ *
* @author chenshun
* @email sunlightcs@gmail.com
*/
@@ -58,7 +58,7 @@ public class GenUtils {
templates.add("template/add-or-update.vue.vm");
return templates;
}
-
+
/**
* 生成代码
*/
@@ -75,7 +75,7 @@ public class GenUtils {
String className = tableToJava(tableEntity.getTableName(), config.getString("tablePrefix"));
tableEntity.setClassName(className);
tableEntity.setClassname(StringUtils.uncapitalize(className));
-
+
//列信息
List columsList = new ArrayList<>();
for(Map column : columns){
@@ -84,12 +84,12 @@ public class GenUtils {
columnEntity.setDataType(column.get("dataType"));
columnEntity.setComments(column.get("columnComment"));
columnEntity.setExtra(column.get("extra"));
-
+
//列名转换成Java属性名
String attrName = columnToJava(columnEntity.getColumnName());
columnEntity.setAttrName(attrName);
columnEntity.setAttrname(StringUtils.uncapitalize(attrName));
-
+
//列的数据类型，转换成Java类型
String attrType = config.getString(columnEntity.getDataType(), "unknowType");
columnEntity.setAttrType(attrType);
@@ -100,24 +100,24 @@ public class GenUtils {
if("PRI".equalsIgnoreCase(column.get("columnKey")) && tableEntity.getPk() == null){
tableEntity.setPk(columnEntity);
}
-
+
columsList.add(columnEntity);
}
tableEntity.setColumns(columsList);
-
+
//没主键，则第一个字段为主键
if(tableEntity.getPk() == null){
tableEntity.setPk(tableEntity.getColumns().get(0));
}
-
+
//设置velocity资源加载器
- Properties prop = new Properties();
- prop.put("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+ Properties prop = new Properties();
+ prop.put("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
Velocity.init(prop);
String main = config.getString("main" );
main = StringUtils.isBlank(main) ? config.getString("package" ) : main;
-
+
//封装模板数据
Map map = new HashMap<>();
map.put("tableName", tableEntity.getTableName());
@@ -129,14 +129,7 @@ public class GenUtils {
map.put("columns", tableEntity.getColumns());
map.put("hasBigDecimal", hasBigDecimal);
map.put("main", main);
-
- String moduleName = config.getString("moduleName" );
- if(StringUtils.isNotBlank(moduleName)){
- map.put("package", config.getString("package" ) + "." + moduleName);
- }else {
- map.put("package", config.getString("package" ));
- }
-
+ map.put("package", config.getString("package" ));
map.put("moduleName", config.getString("moduleName" ));
map.put("author", config.getString("author"));
map.put("version", config.getString("version"));
@@ -146,7 +139,7 @@ public class GenUtils {
VelocityContext context = new VelocityContext(map);
-
+
//获取模板列表
List templates = getTemplates();
for(String template : templates){
@@ -154,7 +147,7 @@ public class GenUtils {
StringWriter sw = new StringWriter();
Template tpl = Velocity.getTemplate(template, "UTF-8");
tpl.merge(context, sw);
-
+
try {
//添加到zip
zip.putNextEntry(new ZipEntry(getFileName(template, tableEntity.getClassName(), config.getString("package"), config.getString("moduleName"))));
@@ -166,15 +159,15 @@ public class GenUtils {
}
}
}
-
-
+
+
/**
* 列名转换成Java属性名
*/
public static String columnToJava(String columnName) {
return WordUtils.capitalizeFully(columnName, new char[]{'_'}).replace("_", "");
}
-
+
/**
* 表名转换成Java类名
*/
@@ -184,7 +177,7 @@ public class GenUtils {
}
return columnToJava(tableName);
}
-
+
/**
* 获取配置信息
*/
@@ -202,7 +195,7 @@ public class GenUtils {
public static String getFileName(String template, String className, String packageName, String moduleName) {
String packagePath = "main" + File.separator + "java" + File.separator;
if (StringUtils.isNotBlank(packageName)) {
- packagePath += packageName.replace(".", File.separator) + File.separator + moduleName + File.separator;
+ packagePath += packageName.replace(".", File.separator) + File.separator;
}
if (template.contains("Entity.java.vm" )) {
@@ -234,7 +227,7 @@ public class GenUtils {
}
if (template.contains("DTO.java.vm" )) {
- return moduleName + File.separator + "dto" + File.separator + className + "DTO.java";
+ return "dto" + File.separator + className + "DTO.java";
}
if (template.contains("Dao.xml.vm" )) {
From 9480c366d46c8d7f007097d39f2af28b56ce62fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?=
Date: Thu, 5 Sep 2019 11:04:18 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E8=A7=84=E5=88=99=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epdc/dto/category/EventCategoryDTO.java | 91 +++++++++++++++
.../controller/EventCategoryController.java | 95 ++++++++++++++++
.../category/dao/EventCategoryDao.java | 33 ++++++
.../category/entity/EventCategoryEntity.java | 61 ++++++++++
.../category/excel/EventCategoryExcel.java | 68 +++++++++++
.../category/redis/EventCategoryRedis.java | 47 ++++++++
.../service/EventCategoryService.java | 96 ++++++++++++++++
.../impl/EventCategoryServiceImpl.java | 106 ++++++++++++++++++
.../mapper/category/EventCategoryDao.xml | 21 ++++
9 files changed, 618 insertions(+)
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/EventCategoryDTO.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/EventCategoryController.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/dao/EventCategoryDao.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/EventCategoryEntity.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/excel/EventCategoryExcel.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/redis/EventCategoryRedis.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/EventCategoryService.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/EventCategoryServiceImpl.java
create mode 100755 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/EventCategoryDao.xml
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/EventCategoryDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/EventCategoryDTO.java
new file mode 100755
index 000000000..3cd2158d1
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/EventCategoryDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ PageData page = eventCategoryService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ EventCategoryDTO data = eventCategoryService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody EventCategoryDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ eventCategoryService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody EventCategoryDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ eventCategoryService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ eventCategoryService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = eventCategoryService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, EventCategoryExcel.class);
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/dao/EventCategoryDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/dao/EventCategoryDao.java
new file mode 100755
index 000000000..f743b370a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/dao/EventCategoryDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/EventCategoryEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/EventCategoryEntity.java
new file mode 100755
index 000000000..a1bf54970
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/EventCategoryEntity.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author
+ * @date
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author
+ * @date
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return EventCategoryDTO
+ * @author
+ * @date
+ */
+ EventCategoryDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author
+ * @date
+ */
+ void save(EventCategoryDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author
+ * @date
+ */
+ void update(EventCategoryDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author
+ * @date
+ */
+ void delete(String[] ids);
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/EventCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/EventCategoryServiceImpl.java
new file mode 100755
index 000000000..ae08a1cb6
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/EventCategoryServiceImpl.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see implements EventCategoryService {
+
+ @Autowired
+ private EventCategoryRedis eventCategoryRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, EventCategoryDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, EventCategoryDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+ String categoryCode = (String)params.get("categoryCode");
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+ wrapper.eq(StringUtils.isNotBlank(categoryCode), "CATEGORY_CODE", categoryCode);
+
+ return wrapper;
+ }
+
+ @Override
+ public EventCategoryDTO get(String id) {
+ EventCategoryEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, EventCategoryDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(EventCategoryDTO dto) {
+ EventCategoryEntity entity = ConvertUtils.sourceToTarget(dto, EventCategoryEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(EventCategoryDTO dto) {
+ EventCategoryEntity entity = ConvertUtils.sourceToTarget(dto, EventCategoryEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/EventCategoryDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/EventCategoryDao.xml
new file mode 100755
index 000000000..7f3c11566
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/EventCategoryDao.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From f4ffa11b12eecc75344a385bda6dc0918206bda9 Mon Sep 17 00:00:00 2001
From: liuchuang
Date: Thu, 5 Sep 2019 11:07:18 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E5=AE=A1=E6=A0=B8init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epdc/constant/EventIssueItemState.java | 80 +++++++++
.../esua/epdc/dto/events/EpdcEventsDTO.java | 69 ++------
.../epdc/dto/events/EpdcEventsDetailDTO.java | 37 ++++
.../events/form/EpdcEventsReviewFormDTO.java | 32 ++++
.../elink/esua/epdc/dto/issue/IssueDTO.java | 167 ++++++++++++++++++
.../controller/EpdcEventsController.java | 21 ++-
.../modules/events/dao/EpdcEventsDao.java | 11 +-
.../events/entity/EpdcEventsEntity.java | 14 +-
.../events/service/EpdcEventsService.java | 21 ++-
.../service/impl/EpdcEventsServiceImpl.java | 76 +++++++-
.../issue/controller/IssueController.java | 94 ++++++++++
.../esua/epdc/modules/issue/dao/IssueDao.java | 33 ++++
.../modules/issue/dao/IssueHandleDao.java | 33 ++++
.../modules/issue/entity/IssueEntity.java | 137 ++++++++++++++
.../issue/entity/IssueHandleEntity.java | 56 ++++++
.../epdc/modules/issue/excel/IssueExcel.java | 114 ++++++++++++
.../epdc/modules/issue/redis/IssueRedis.java | 47 +++++
.../issue/service/IssueHandleService.java | 40 +++++
.../modules/issue/service/IssueService.java | 95 ++++++++++
.../service/impl/IssueHandleServiceImpl.java | 45 +++++
.../issue/service/impl/IssueServiceImpl.java | 104 +++++++++++
.../resources/mapper/events/EpdcEventsDao.xml | 18 +-
.../main/resources/mapper/issue/IssueDao.xml | 6 +
.../resources/mapper/issue/IssueHandleDao.xml | 6 +
24 files changed, 1290 insertions(+), 66 deletions(-)
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueHandleDao.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueHandleEntity.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/excel/IssueExcel.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/redis/IssueRedis.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueHandleService.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueHandleServiceImpl.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueHandleDao.xml
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java
new file mode 100644
index 000000000..63be703d2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java
@@ -0,0 +1,80 @@
+package com.elink.esua.epdc.constant;
+
+/**
+ * 事件、议题、项目状态常量
+ * @Author LC
+ * @Date 2019/9/5 9:14
+ */
+public interface EventIssueItemState {
+ /**
+ * 事件-待审核
+ */
+ int EVENT_PENDING_REVIEW = 0;
+ /**
+ * 事件-驳回
+ */
+ int EVENT_REVIEW_REJECT = 2;
+ /**
+ * 事件-审核通过
+ */
+ int EVENT_REVIEW_PASS = 4;
+
+ /**
+ * 议题-审核通过
+ */
+ int ISSUE_REVIEW_PASS = 0;
+ /**
+ * 议题-已关闭
+ */
+ int ISSUE_CLOSED = 2;
+ /**
+ * 议题-已转项目
+ */
+ int ISSUE_CHANGE_TO_ITEM = 4;
+
+ /**
+ * 项目-待网格长处理
+ */
+ int ITEM_WAITING_GRID_HANDLE = 0;
+ /**
+ * 项目-待社区处理
+ */
+ int ITEM_WAITING_COMMUNITY_HANDLE = 5;
+ /**
+ * 项目-待街道党工委处理
+ */
+ int ITEM_WAITING_STREET_FIRST_HANDLE = 10;
+ /**
+ * 项目-待街道处理
+ */
+ int ITEM_WAITING_STREET_SECOND_HANDLE = 15;
+ /**
+ * 项目-待区直部门处理
+ */
+ int ITEM_WAITING_AREA_HANDLE = 20;
+ /**
+ * 项目-处理中
+ */
+ int ITEM_HANDLING = 25;
+ /**
+ * 项目-关闭
+ */
+ int ITEM_CLOSED= 30;
+ /**
+ * 项目-结案
+ */
+ int ITEM_CLOSEING_CASE= 35;
+
+ /**
+ * 议题处理-审核通过
+ */
+ int ISSUE_HANDLED_PASS= 0;
+ /**
+ * 议题处理-反馈
+ */
+ int ISSUE_HANDLED_FEEDBACK= 1;
+ /**
+ * 议题处理-关闭
+ */
+ int ISSUE_HANDLED_CLOSED= 2;
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java
index 14988bb40..4f5899fd8 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java
@@ -22,10 +22,8 @@ import lombok.Data;
import java.io.Serializable;
import java.util.Date;
-import java.math.BigDecimal;
-
/**
- * 事件表 事件表
+ * 党群议事-议题管理-待审核列表
*
* @author Mark sunlightcs@gmail.com
* @since v1.0.0 2019-09-04
@@ -34,58 +32,21 @@ import java.math.BigDecimal;
public class EpdcEventsDTO implements Serializable {
private static final long serialVersionUID = 1L;
+ /**
+ * 事件ID
+ */
private String id;
-
- private String userId;
-
- private String issueContent;
-
- private String area;
-
- private String areaId;
-
- private String street;
-
- private String streetId;
-
- private String community;
-
- private String communityId;
-
- private String grid;
-
- private String gridId;
-
- private String issueAddress;
-
- private String issueCategoryId;
-
- private BigDecimal issusLatitude;
-
- private BigDecimal issueLongitude;
-
- private String friendlyCommunityId;
-
- private Integer eventState;
-
- private Integer approveNum;
-
- private Integer opposeNum;
-
- private Integer commentNum;
-
- private Integer browseNum;
-
- private String delFlag;
-
- private Integer revision;
-
- private String createdBy;
-
+ /**
+ * 用户昵称
+ */
+ private String nickName;
+ /**
+ * 事件内容
+ */
+ private String eventContent;
+ /**
+ * 提交时间
+ */
private Date createdTime;
- private String updatedBy;
-
- private Date updatedTime;
-
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java
new file mode 100644
index 000000000..9db5f4821
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java
@@ -0,0 +1,37 @@
+package com.elink.esua.epdc.dto.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author LC
+ * @Date 2019/9/4 20:18
+ */
+@Data
+public class EpdcEventsDetailDTO implements Serializable {
+ private static final long serialVersionUID = 7859650300609726002L;
+
+ /**
+ * 事件ID
+ */
+ private String id;
+ /**
+ * 用户昵称
+ */
+ private String nickName;
+ /**
+ * 事件内容
+ */
+ private String eventContent;
+ /**
+ * 提交时间
+ */
+ private Date createdTime;
+ /**
+ * 图片
+ */
+ private List images;
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java
new file mode 100644
index 000000000..4c1d5c18b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java
@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.dto.events.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 审核事件提交表单DTO
+ * @Author LC
+ * @Date 2019/9/4 21:11
+ */
+@Data
+public class EpdcEventsReviewFormDTO implements Serializable {
+ private static final long serialVersionUID = 3950470078846120789L;
+
+ /**
+ * 事件ID
+ */
+ private String id;
+ /**
+ * 类别ID
+ */
+ private String categoryId;
+ /**
+ * 事件状态
+ */
+ private Integer eventState;
+ /**
+ * 处理意见
+ */
+ private String advice;
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java
new file mode 100644
index 000000000..93c1987d2
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueDTO.java
@@ -0,0 +1,167 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see get(@PathVariable("id") String id){
- EpdcEventsDTO data = epdcEventsService.get(id);
+ public Result get(@PathVariable("id") String id){
+ EpdcEventsDetailDTO data = epdcEventsService.get(id);
- return new Result().ok(data);
+ return new Result().ok(data);
}
@PostMapping
@@ -99,4 +102,16 @@ public class EpdcEventsController {
ExcelUtils.exportExcelToTarget(response, null, list, EpdcEventsExcel.class);
}
+ /**
+ * 事件审核
+ * @Params: [dto]
+ * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author: liuchuang
+ * @Date: 2019/9/5 9:02
+ */
+ @PostMapping("review")
+ public Result eventReview(@RequestBody EpdcEventsReviewFormDTO dto) {
+ return epdcEventsService.eventReview(dto);
+ }
+
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
index cabc90183..1a605f71d 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
@@ -18,8 +18,10 @@
package com.elink.esua.epdc.modules.events.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* 事件表 事件表
@@ -29,5 +31,12 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface EpdcEventsDao extends BaseDao {
-
+ /**
+ * 根据ID获取事件详情
+ * @Params: [id]
+ * @Return: com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO
+ * @Author: liuchuang
+ * @Date: 2019/9/4 20:31
+ */
+ EpdcEventsDetailDTO getEventDetailById(@Param("id") String id);
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
index c0bd0aec5..5021fc817 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
@@ -50,10 +50,18 @@ public class EpdcEventsEntity extends BaseEpdcEntity {
* 用户ID
*/
private String userId;
+ /**
+ * 用户昵称
+ */
+ private String nickName;
+ /**
+ * 用户头像
+ */
+ private String userFace;
/**
* 议题内容
*/
- private String issueContent;
+ private String eventContent;
/**
* 区
*/
@@ -110,6 +118,10 @@ public class EpdcEventsEntity extends BaseEpdcEntity {
* 事件状态 0-待审核，2-驳回，4-审核通过
*/
private Integer eventState;
+ /**
+ * 意见
+ */
+ private String advice;
/**
* 点赞次数
*/
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
index 7fddbd249..e4bc32b85 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
@@ -19,7 +19,10 @@ package com.elink.esua.epdc.modules.events.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.events.EpdcEventsDTO;
+import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
import java.util.List;
@@ -37,11 +40,27 @@ public interface EpdcEventsService extends BaseService {
List list(Map params);
- EpdcEventsDTO get(String id);
+ /**
+ * 根据ID获取事件详情
+ * @Params: [id]
+ * @Return: com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO
+ * @Author: liuchuang
+ * @Date: 2019/9/4 20:47
+ */
+ EpdcEventsDetailDTO get(String id);
void save(EpdcEventsDTO dto);
void update(EpdcEventsDTO dto);
void delete(String[] ids);
+
+ /**
+ * 事件审核
+ * @Params: [dto]
+ * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author: liuchuang
+ * @Date: 2019/9/5 9:35
+ */
+ Result eventReview(EpdcEventsReviewFormDTO dto);
}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
index 4dc2e1757..d708e93ab 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
@@ -24,11 +24,19 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.constant.EventIssueItemState;
import com.elink.esua.epdc.dto.events.EpdcEventsDTO;
+import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
+import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
import com.elink.esua.epdc.modules.events.dao.EpdcEventsDao;
import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
import com.elink.esua.epdc.modules.events.redis.EpdcEventsRedis;
import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
+import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
+import com.elink.esua.epdc.modules.issue.entity.IssueHandleEntity;
+import com.elink.esua.epdc.modules.issue.service.IssueHandleService;
+import com.elink.esua.epdc.modules.issue.service.IssueService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -46,8 +54,12 @@ import java.util.Map;
*/
@Service
public class EpdcEventsServiceImpl extends BaseServiceImpl implements EpdcEventsService {
+
+ @Autowired
+ private IssueService issueService;
+
@Autowired
- private EpdcEventsRedis epdcEventsRedis;
+ private IssueHandleService issueHandleService;
@Override
public PageData page(Map params) {
@@ -78,10 +90,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see > page(@RequestParam Map params){
+ PageData page = issueService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ IssueDTO data = issueService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody IssueDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ issueService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody IssueDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ issueService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ issueService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = issueService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, IssueExcel.class);
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
new file mode 100644
index 000000000..a4cbe1646
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueHandleDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueHandleDao.java
new file mode 100644
index 000000000..0292def24
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueHandleDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java
new file mode 100644
index 000000000..3a53eb2cd
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/entity/IssueEntity.java
@@ -0,0 +1,137 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *