diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java index 7e5ae3941..6862e3776 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @author Mark sunlightcs@gmail.com * @since 1.1.0 */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ParamsFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ParamsFeignClientFallback.class,url = "http://127.0.0.1:9092") public interface ParamsFeignClient { /** diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java index 8077f0782..175fbedaa 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java @@ -22,7 +22,7 @@ import java.util.List; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ResourceFeignClientFallback.class, contextId = "ResourceFeignClient") +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ResourceFeignClientFallback.class, contextId = "ResourceFeignClient",url = "http://127.0.0.1:9092") public interface ResourceFeignClient { /** * 获取所有资源列表 diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 9b3557e17..ca9671b3f 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -28,7 +28,7 @@ import java.util.List; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient") +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient",url = "http://127.0.0.1:9092") public interface UserFeignClient { /** diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index a153a845b..3618c936c 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -98,21 +98,26 @@ elink@888 - lb://epdc-auth-server - lb://epdc-admin-server + + http://127.0.0.1:9091 + - lb://epdc-activiti-server - + lb://epdc-activiti-server + + + + http://127.0.0.1:9092 + lb://epdc-activiti-server http://127.0.0.1:9040 lb://epdc-app-server - lb://epdc-heart-server - + + http://127.0.0.1:9060 lb://epdc-job-server - lb://epdc-message-server - + + http://127.0.0.1:9062 http://127.0.0.1:9064 lb://epdc-oss-server @@ -121,14 +126,14 @@ lb://epdc-services-server - - http://127.0.0.1:9068 + lb://epdc-user-server + lb://epdc-demo-server http://127.0.0.1:9063 lb://epdc-websocket-server - - lb://epdc-custom-server + + http://127.0.0.1:9076 lb://epdc-points-server http://127.0.0.1:9069 diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java index b52b556f8..1c378fd9d 100644 --- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java +++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@FeignClient(name = ServiceConstant.EPDC_AUTH_SERVER, fallback = ResourceFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_AUTH_SERVER, fallback = ResourceFeignClientFallback.class,url = "http://127.0.0.1:9091") public interface ResourceFeignClient { /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java index 95fd6e0e1..15c6742f8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java @@ -58,7 +58,7 @@ public interface ActInfoFeignClient { Result getRejectDetail(ActInfoAppFormDTO formDto); @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getCancelDetail(@PathVariable String id); + Result getCancelDetail(@PathVariable("id") String id); @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getBannerList(); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java new file mode 100644 index 000000000..bc237a07b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java @@ -0,0 +1,51 @@ +/** + * 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 . + */ + +package com.elink.esua.epdc.dto.evaluate; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 评价部门表 评价部门表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-02-05 + */ +@Data +public class EvaluateUpdateDeptOfficerCountDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 部门ID + */ + private String deptId; + + /** + * 干部人数 + */ + private Integer officerCount; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java index fed3f2b48..8791c4f8c 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.evaluate.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO; +import com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO; import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity; @@ -66,4 +67,22 @@ public interface EvaluateOfficerDao extends BaseDao { List getEvaluateOfficerCount(Map params); List getDeptOfficer(Map params); + + /** + * 街道干部管理表干部人数加1 + * @param deptId + */ + void officerCountAddOne(@Param("deptId")String deptId); + + /** + * 街道干部管理表干部人数减少对应数量 + * @param evaluateUpdateDeptOfficerCountDTO + */ + void updateOfficerCount(EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO); + + /** + * 导入操作时更新街道干部管理表干部人数 + * @param evaluateUpdateDeptOfficerCountDTO + */ + void updateOfficerCountByDeptId(EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java index 8cdeb3eed..7ab89ede4 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java @@ -26,10 +26,10 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO; import com.elink.esua.epdc.dto.evaluate.EvaluateRoleDTO; +import com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO; import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO; @@ -52,10 +52,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.*; @@ -166,7 +162,11 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl + + update epdc_evaluate_dept set OFFICER_COUNT = OFFICER_COUNT+1 where DEPT_ID = #{deptId} + + + + update epdc_evaluate_dept set OFFICER_COUNT = OFFICER_COUNT- #{officerCount} where DEPT_ID = (select eeo.DEPT_ID from epdc_evaluate_officer eeo where eeo.id = #{id}) + + + + update epdc_evaluate_dept set OFFICER_COUNT = #{officerCount} where DEPT_ID = #{deptId} + + diff --git a/renren-cloud-generator/src/main/resources/application.yml b/renren-cloud-generator/src/main/resources/application.yml index 91fe3458c..b014c4c3a 100644 --- a/renren-cloud-generator/src/main/resources/application.yml +++ b/renren-cloud-generator/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://47.104.224.45:3308/esua_epdc_kpi?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://47.104.224.45:3308/esua_epdc_custom?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: epdc password: elink833066 #oracle配置 diff --git a/renren-cloud-generator/src/main/resources/generator.properties b/renren-cloud-generator/src/main/resources/generator.properties index 9e9f68440..0490a3067 100644 --- a/renren-cloud-generator/src/main/resources/generator.properties +++ b/renren-cloud-generator/src/main/resources/generator.properties @@ -3,7 +3,7 @@ main= #\u5305\u540D package=com.elink.esua.epdc -moduleName=kpi +moduleName=custom #\u4F5C\u8005 author=qu #\u7248\u672C\u53F7