干部人数更新

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 {
 
     /**

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 {
     /**
      * 获取所有资源列表

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 {
 
     /**

esua-epdc/epdc-gateway/pom.xml

@@ -98,21 +98,26 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <!-- gateway routes -->
-                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
+                <!--<gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>-->
-                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
+                <gateway.routes.epdc-auth-server.uri>http://127.0.0.1:9091</gateway.routes.epdc-auth-server.uri>
+                <!--<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
                 <!--                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
+                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
-                </gateway.routes.epdc-activiti-server.uri>
+                <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
+                <!--                <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>-->
+                <!--<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
+                                <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
+                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
                 <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
                 <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
                 <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
                 <!--                <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
-                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
+                <!--<gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>-->
-                <!--                <gateway.routes.epdc-heart-server.uri>http://127.0.0.1:9060</gateway.routes.epdc-heart-server.uri>-->
+                <gateway.routes.epdc-heart-server.uri>http://127.0.0.1:9060</gateway.routes.epdc-heart-server.uri>
                 <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
                 <!--                <gateway.routes.epdc-job-server.uri>http://127.0.0.1:9061</gateway.routes.epdc-job-server.uri>-->
-                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
+                <!--<gateway.routes.epdc-message-server.uri>lb://epdc-message-server</gateway.routes.epdc-message-server.uri>-->
-                </gateway.routes.epdc-message-server.uri>
+                <gateway.routes.epdc-message-server.uri>http://127.0.0.1:9062</gateway.routes.epdc-message-server.uri>
                 <!--<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>-->
                 <gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
@@ -121,14 +126,14 @@
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
                 </gateway.routes.epdc-services-server.uri>
                 <!--                <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->
-                <!--<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>-->
+                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
-                <gateway.routes.epdc-user-server.uri>http://127.0.0.1:9068</gateway.routes.epdc-user-server.uri>
+                <!--<gateway.routes.epdc-user-server.uri>http://127.0.0.1:9068</gateway.routes.epdc-user-server.uri>-->
                 <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
                 <gateway.routes.epdc-group-server.uri>http://127.0.0.1:9063</gateway.routes.epdc-group-server.uri>
                 <!--<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>-->
                 <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server</gateway.routes.epdc-websocket-server.uri>
-<!--                <gateway.routes.epdc-custom-server.uri>http://127.0.0.1:9076</gateway.routes.epdc-kpi-server.uri>-->
+<!--                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-kpi-server.uri>-->
-                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
+                <gateway.routes.epdc-custom-server.uri>http://127.0.0.1:9076</gateway.routes.epdc-custom-server.uri>
                 <gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri>
                 <!--                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>-->
                 <gateway.routes.epdc-kpi-server.uri>http://127.0.0.1:9069</gateway.routes.epdc-kpi-server.uri>

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 {
 
     /**

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<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto);
 
     @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id);
+    Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable("id") String id);
 
     @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<ActBannerDTO>> getBannerList();

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}

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<EvaluateOfficerEntity> {
     List<EvaluateOfficerCountResultDTO> getEvaluateOfficerCount(Map<String, Object> params);
 
     List<EvaluateOfficerAppResultDTO> getDeptOfficer(Map<String, Object> params);
+
+    /**
+     * 街道干部管理表干部人数加1
+     * @param deptId
+     */
+    void officerCountAddOne(@Param("deptId")String deptId);
+
+    /**
+     * 街道干部管理表干部人数减少对应数量
+     * @param evaluateUpdateDeptOfficerCountDTO
+     */
+    void updateOfficerCount(EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO);
+
+    /**
+     * 导入操作时更新街道干部管理表干部人数
+     * @param evaluateUpdateDeptOfficerCountDTO
+     */
+    void updateOfficerCountByDeptId(EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO);
 }

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<EvaluateOfficerD
     @Transactional(rollbackFor = Exception.class)
     public void save(EvaluateOfficerDTO dto) {
         EvaluateOfficerEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateOfficerEntity.class);
+        // 街道干部管理表干部人数加1
+        String deptId = entity.getDeptId();
         insert(entity);
+        baseDao.officerCountAddOne(deptId);
+
     }
 
     @Override
@@ -186,6 +186,14 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
     public void delete(String[] ids) {
         // 逻辑删除（@TableLogic 注解）
         baseDao.deleteBatchIds(Arrays.asList(ids));
+
+        // 街道干部管理表干部人数减少对应数量
+        String id = ids[0];
+        int num = ids.length;
+        EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO = new EvaluateUpdateDeptOfficerCountDTO();
+        evaluateUpdateDeptOfficerCountDTO.setId(id);
+        evaluateUpdateDeptOfficerCountDTO.setOfficerCount(num);
+        baseDao.updateOfficerCount(evaluateUpdateDeptOfficerCountDTO);
     }
 
     @Override
@@ -292,6 +300,13 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
                     evaluateOfficerEntities[k] = list.get(k);
                 }
                 baseDao.insertList(evaluateOfficerEntities);
+
+                // 导入操作时更新街道干部管理表干部人数
+                int num = list.size();
+                EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO = new EvaluateUpdateDeptOfficerCountDTO();
+                evaluateUpdateDeptOfficerCountDTO.setDeptId(deptId);
+                evaluateUpdateDeptOfficerCountDTO.setOfficerCount(num);
+                baseDao.updateOfficerCountByDeptId(evaluateUpdateDeptOfficerCountDTO);
             }
             result.setMsg("success");
             result.setCode(0);

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml

@@ -102,6 +102,18 @@
         where  ID = #{id}  and  DEL_FLAG = '0'
     </update>
 
+    <update id="officerCountAddOne" parameterType="String">
+        update epdc_evaluate_dept set OFFICER_COUNT = OFFICER_COUNT+1 where DEPT_ID = #{deptId}
+    </update>
+
+    <update id="updateOfficerCount" parameterType="com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO">
+        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>
+
+    <update id="updateOfficerCountByDeptId" parameterType="com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO">
+        update epdc_evaluate_dept set OFFICER_COUNT = #{officerCount} where DEPT_ID = #{deptId}
+    </update>
+
 
     <resultMap type="com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO" id="evaluateOfficerCountMap">
         <result property="id" column="ID"/>

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配置

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