Merge branches 'dev_grid_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-admin/epmet-admin-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.15</version>
+    <version>0.3.17</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-admin</artifactId>

epmet-auth/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.70</version>
+    <version>0.3.72</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

epmet-auth/src/main/java/com/epmet/controller/LoginController.java

@@ -23,6 +23,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 
 /**
  * @Description 通用登录接口
@@ -121,4 +124,86 @@ public class LoginController {
 		}
 		return new Result().ok("");
 	}
+	//================start test code==========
+	/**
+	 * 校验签名
+	 */
+	public static boolean checkSignature(String signature, String timestamp, String nonce) {
+		System.out.println("signature:" + signature + "timestamp:" + timestamp + "nonc:" + nonce);
+		String WECHAT_TOKEN = "1jkoyyih83nj8";
+		String[] arr = new String[]{WECHAT_TOKEN, timestamp, nonce};
+		// 将token、timestamp、nonce三个参数进行字典序排序
+		Arrays.sort(arr);
+		StringBuilder content = new StringBuilder();
+		for (int i = 0; i < arr.length; i++) {
+			content.append(arr[i]);
+		}
+		MessageDigest md = null;
+		String tmpStr = null;
+
+		try {
+			md = MessageDigest.getInstance("SHA-1");
+			// 将三个参数字符串拼接成一个字符串进行sha1加密
+			byte[] digest = md.digest(content.toString().getBytes());
+			tmpStr = byteToStr(digest);
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		}
+
+		content = null;
+		// 将sha1加密后的字符串可与signature对比，标识该请求来源于微信
+		System.out.println(tmpStr.equals(signature.toUpperCase()));
+		return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false;
+	}
+
+	/**
+	 * 将字节数组转换为十六进制字符串
+	 *
+	 * @param byteArray
+	 * @return
+	 */
+	private static String byteToStr(byte[] byteArray) {
+		String strDigest = "";
+		for (int i = 0; i < byteArray.length; i++) {
+			strDigest += byteToHexStr(byteArray[i]);
+		}
+		return strDigest;
+	}
+
+	/**
+	 * 将字节转换为十六进制字符串
+	 *
+	 * @param mByte
+	 * @return
+	 */
+	private static String byteToHexStr(byte mByte) {
+		char[] Digit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+		char[] tempArr = new char[2];
+		tempArr[0] = Digit[(mByte >>> 4) & 0X0F];
+		tempArr[1] = Digit[mByte & 0X0F];
+
+		String s = new String(tempArr);
+		return s;
+	}
+
+
+	/**
+	 * 打开开发者模式签名认证
+	 * @param signature
+	 * @param timestamp
+	 * @param nonce
+	 * @param echostr
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/service", method = RequestMethod.GET)
+	public Object defaultView(String signature, String timestamp, String nonce, String echostr) {
+		if (echostr == null || echostr.isEmpty()) {
+			return nonce;
+		}
+		if (this.checkSignature(signature, timestamp, nonce)) {
+			return echostr;
+		}
+		return nonce;
+	}
 }

epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java

@@ -295,7 +295,7 @@ public class LoginServiceImpl implements LoginService {
 		if (!flag) {
 			logger.warn(String.format("用户%s登录，验证码输入错误", formDTO.getPhone()));
 			//2020-05-21去除验证码校验
-			return new Result<UserTokenResultDTO>().error(EpmetErrorCode.ERR10019.getCode());
+			//return new Result<UserTokenResultDTO>().error(EpmetErrorCode.ERR10019.getCode());
 		}
 		//2、账号是否存在
 		//获取用户信息

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java

@@ -1,5 +1,6 @@
 package com.epmet.commons.tools.aspect;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.ThreadLocalConstant;
 import com.epmet.commons.tools.exception.*;
@@ -14,6 +15,9 @@ import javax.servlet.http.HttpServletRequest;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 日志切面
@@ -54,6 +58,8 @@ public abstract class BaseRequestLogAspect {
         //    transactionSerial = UUID.randomUUID().toString();
         //}
 
+        Map<String, String> requestHeaders = getRequestHeaders(request);
+
         // 将当前线程名称设置为事务流水号
         if (!StringUtils.isEmpty(transactionSerial)) {
             Thread.currentThread().setName(transactionSerial);
@@ -64,7 +70,8 @@ public abstract class BaseRequestLogAspect {
         try {
             Object[] args = point.getArgs();
             ThreadLocalConstant.requestParam.set(Arrays.toString(point.getArgs()));
-            log.info(">>>>>>>>请求信息>>>>>>>>:事务流水号:{},url:{} ,method:{},请求参数:{}", transactionSerial, requestURI, method, objectsToString(args));
+            log.info(">>>>>>>>请求信息>>>>>>>>:事务流水号:{},url:{} ,method:{},请求参数:{},请求头:{}",
+                    transactionSerial, requestURI, method, objectsToString(args), requestHeaders);
             result = point.proceed();
             resultInfoLog(transactionSerial, getExecPeriod(startTime), result);
         } catch (RenException e) {
@@ -91,6 +98,23 @@ public abstract class BaseRequestLogAspect {
         return result;
     }
 
+    /**
+     * @Description 获取请求头信息
+     * @return
+     * @author wxz
+     * @date 2021.03.31 13:59
+    */
+    private Map<String, String> getRequestHeaders(HttpServletRequest request) {
+        Enumeration<String> headerNames = request.getHeaderNames();
+        HashMap<String, String> headerMap = new HashMap<>();
+        while (headerNames.hasMoreElements()) {
+            String headerName = headerNames.nextElement();
+            String headerValue = request.getHeader(headerName);
+            headerMap.put(headerName, headerValue);
+        }
+        return headerMap;
+    }
+
     /**
      * info日志
      * @param transactionSerial
@@ -225,7 +249,13 @@ public abstract class BaseRequestLogAspect {
             StringBuilder builder = new StringBuilder("[");
             for (Object object : args) {
                 if (object != null) {
-                    builder.append(object.toString());
+                    try {
+                        // 尝试作为json解析
+                        String objectString = JSON.toJSONString(object);
+                        builder.append(objectString);
+                    } catch (Exception e) {
+                        builder.append(object.toString());
+                    }
                     builder.append(",");
                 }
             }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -341,6 +341,13 @@ public class RedisKeys {
 		return rootPrefix.concat("stats:calflag");
 	}
 
+	/**
+	 * 插入大屏指标数据分布式锁 key
+	 */
+	public static String getScreenIndexDataLockKey() {
+		return rootPrefix.concat("stats:indexcal:lock");
+	}
+
 	/**
 	 * footbar缓存key
 	 * @param customerId
@@ -351,12 +358,6 @@ public class RedisKeys {
 		return rootPrefix.concat("footbar").concat(":").concat(customerId).concat(":").concat(appType);
 	}
 
-	/**
-	 * 插入大屏指标数据分布式锁 key
-	 */
-	public static String getScreenIndexDataLockKey() {
-		return rootPrefix.concat("stats:indexcal:lock");
-	}
 
 	/**
 	 * @return

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Pinyin4jUtil.java

@@ -31,7 +31,6 @@ public class Pinyin4jUtil {
         duoyinMap.put('均',new String[]{"jun"});
         duoyinMap.put('会', new String[]{"hui"});
         duoyinMap.put('属', new String[]{"shu"});
-        duoyinMap.put('调', new String[]{"diao"});
     }
 
     /**
@@ -43,6 +42,7 @@ public class Pinyin4jUtil {
      */
     public static String getFirstSpellPinYin(String src, boolean isFullSpell) {
         String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, 1));
+        System.out.println("targetStr="+targetStr);
         String[] split = targetStr.split(",");
         if (split.length > 1) {
             targetStr = split[0];
@@ -59,6 +59,7 @@ public class Pinyin4jUtil {
      */
     public static String getSpellPinYin(String src, boolean isFullSpell,Integer preFont) {
         String targetStr = Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(src, isFullSpell, preFont));
+        System.out.println("targetStr="+targetStr);
         String[] split = targetStr.split(",");
         if (split.length > 1) {
             targetStr = split[0];
@@ -195,8 +196,9 @@ public class Pinyin4jUtil {
     }
 
     public static void main(String[] args) {
-        System.out.println(getFirstSpellPinYin("区直部门",false));
+        //System.out.println(getSpellPinYin("社区超期项目数",true,0));
-        System.out.println(getSpellPinYin("党员提出话题数",false,4));
+        System.out.println(getFirstSpellPinYin("区直部门",true));
-        System.out.println(getSpellPinYin("社区超期项目数",false,4));
+        //System.out.println(getSpellPinYin("党员提出话题数",false,4));
+        //System.out.println(getSpellPinYin("社区超期项目数",false,4));
     }
 }

epmet-gateway/src/main/resources/bootstrap.yml

@@ -476,13 +476,16 @@ epmet:
     - /data/aggregator/**
     - /gov/voice/**
     - /resi/voice/**
+    - /epmet/point/**
 
   # 内部认证url白名单(在白名单中的，就不会再校验登录了)
   internalAuthUrlsWhiteList:
     - /epmetuser/customerstaff/customerlist
+    - /auth/wechat/**
+    - /**/druid/**
     - /gov/project/project/platformcallback
     - /oper/customize/customerstartpage/homestartpage
-    - /tduck-api/**
+    - /epmet/point/mqCallback/**
 
   # 外部应用认证，使用AccessToken等头进行认证
   externalOpenUrls:

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -207,6 +207,15 @@ public class EpmetUserController {
         return new Result<UserEventLogoResultDTO>().ok(epmetUserService.mentionMeEvent(tokenDto.getUserId()));
     }
 
+    @GetMapping("export/staffpatroll")
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO, HttpServletResponse response) throws Exception {
+        ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
+        formDTO.setUserId(tokenDto.getUserId());
+        //formDTO.setUserId("73ae6280e46a6653a5605d51d5462725");
+        List<StaffListResultDTO> resultDTOS = epmetUserService.staffPatrolList(formDTO);
+        ExcelUtils.exportExcelToTarget(response, null, resultDTOS, StaffPatrollExcel.class);
+    }
+
     /**
      * @Param formDTO
      * @Description 通讯录】姓名检索工作人员
@@ -261,14 +270,6 @@ public class EpmetUserController {
         return new Result<CustomerStaffResultDTO>().ok(epmetUserService.getStaffInfo(staffId));
     }
 
-    @GetMapping("export/staffpatroll")
-    public void export(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO, HttpServletResponse response) throws Exception {
-        ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
-        formDTO.setUserId(tokenDto.getUserId());
-        //formDTO.setUserId("73ae6280e46a6653a5605d51d5462725");
-        List<StaffListResultDTO> resultDTOS = epmetUserService.staffPatrolList(formDTO);
-        ExcelUtils.exportExcelToTarget(response, null, resultDTOS, StaffPatrollExcel.class);
-    }
 
     /**
      * @Param formDTO

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java

@@ -1,7 +1,5 @@
 package com.epmet.dataaggre.service.epmetuser;
 
-import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO;
-import com.epmet.dataaggre.dto.epmetuser.form.*;
 import com.epmet.dataaggre.dto.epmetuser.form.*;
 import com.epmet.dataaggre.dto.epmetuser.result.*;
 import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO;
@@ -148,4 +146,5 @@ public interface EpmetUserService {
      * @author sun
      */
     StaffDetailV2FormDTO selectByStaffId(String staffId);
+
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java

@@ -87,4 +87,6 @@ public class FineExampleResultDTO implements Serializable {
      * PLAT_JOIN PARTY_RATIO 平台参与议事的党员占比
      */
     private String platJoinPartyRatio = "0.00%";
+
+    private String dataEndTime;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java

@@ -44,4 +44,6 @@ public class GovernCapacityRankResultDTO implements Serializable {
      * 当前agencyName的上一级组织名称
      */
     private String parentAgencyName;
+
+    private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java

@@ -46,4 +46,6 @@ public class GovernCapacityResultDTO implements Serializable {
     private String parentAgencyName;
 
     private String orgId;
+
+    private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java

@@ -39,4 +39,9 @@ public class GrassRootsGovernRankResultDTO implements Serializable {
 	 * 组织名称
 	 */
 	private String orgName;
+
+	/**
+	 * 数据所属月份
+	 */
+	private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java

@@ -35,4 +35,9 @@ public class GrassRootsGovernResultDTO implements Serializable {
 	 * 办结率（当前界面是社区时显示）
 	 */
 	private String closedProjectRatio;
+
+	/**
+	 * 数据所属月份
+	 */
+	private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java

@@ -31,4 +31,6 @@ public class GrassRootsOrgRankResultDTO implements Serializable {
 	 * 组织名称
 	 */
 	private String orgName;
+
+	private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java

@@ -27,4 +27,9 @@ public class GrassRootsOrgResultDTO implements Serializable {
 	 * 项目数
 	 */
 	private Integer projectTotal;
+
+	/**
+	 * 数据所属月份
+	 */
+	private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java

@@ -57,4 +57,8 @@ public class OrgRankDataResultDTO implements Serializable {
     private String parentAgencyName;
 
     private String orgId;
+    /**
+     * 数据所属月份
+     */
+    private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PartyUserPointResultDTO.java

@@ -28,4 +28,6 @@ public class PartyUserPointResultDTO implements Serializable {
      * 用户积分
      * */
     private Integer point;
+
+    private String dataEndTime;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java

@@ -31,4 +31,9 @@ public class PmTotalResultDTO implements Serializable {
 	 * 议题数
 	 */
 	private Integer issueTotal;
+
+	/**
+	 * 数据所属月份
+	 */
+	private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java

@@ -27,4 +27,6 @@ public class ProjectProfileResultDTO implements Serializable {
 	 * 级别
 	 */
 	private String level;
+
+	private String dataEndTime;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PublicPartiProfileResultDTO.java

@@ -49,4 +49,8 @@ public class PublicPartiProfileResultDTO implements Serializable {
 
     private String joinCompareLatestTrend = "";
 
+    /**
+     * 数据所属月份
+     */
+    private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/TopProfileResultDTO.java

@@ -42,4 +42,6 @@ public class TopProfileResultDTO implements Serializable {
      * 项目总数
      */
     private Integer projectNum = 0;
+
+    private String dataEndTime;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java

@@ -11,6 +11,14 @@ import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantity
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyService;
 import com.epmet.datareport.service.project.ProjectService;
 import com.epmet.dto.form.ProcessListFormDTO;
+import com.epmet.dto.form.screen.EfficiencyAnalysisFormDTO;
+import com.epmet.dto.form.screen.QueryQuantityMonthlyFormDTO;
+import com.epmet.dto.form.screen.ScreenCommonFormDTO;
+import com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO;
+import com.epmet.dto.result.screen.ProjectQuantityResultDTO;
+import com.epmet.dto.result.screen.QueryQuantityMonthlyResultDTO;
+import com.epmet.datareport.service.project.ProjectService;
+import com.epmet.dto.form.ProcessListFormDTO;
 import com.epmet.dto.form.project.MassesDiscontentFormV2DTO;
 import com.epmet.dto.result.project.MassesDiscontentResultV2DTO;
 import com.epmet.project.constant.ProjectConstant;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java

@@ -20,6 +20,7 @@ package com.epmet.datareport.dao.evaluationindex.screen;
 import com.epmet.dto.ScreenCustomerAgencyCommonDTO;
 import com.epmet.dto.ScreenCustomerGridDTO;
 import com.epmet.dto.result.ParentListResultDTO;
+import com.epmet.dto.ScreenCustomerAgencyCommonDTO;
 import com.epmet.dto.result.ScreenCustomerAgencyDTO;
 import com.epmet.dto.result.plugins.AgencyNodeDTO;
 import com.epmet.dto.result.plugins.DeptNodeDTO;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassRootsGovernServiceImpl.java

@@ -190,6 +190,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         result.setMonthIncr(convertPercentStr(latest.getMonthIncr(), NumConstant.ZERO));
         result.setJoinCompareLatestMonth(convertPercentStr(latest.getJoinCompareLatestMonth().abs(), NumConstant.ZERO));
         result.setIssueCompareLatestMonth(convertPercentStr(latest.getIssueCompareLatestMonth().abs(), NumConstant.ZERO));
+        result.setMonthId(monthId);
         return result;
     }
 
@@ -279,6 +280,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
             rank.setResponseRatio(convertPercentStr(o.getResponseRatio(),NumConstant.ONE));
             rank.setSatisfactionRatio(convertPercentStr(o.getSatisfactionRatio(),NumConstant.ONE));
             rank.setParentAgencyName(o.getParentAgencyName());
+            rank.setMonthId(o.getMonthId());
             result.add(rank);
         });
         return result;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -211,7 +211,7 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     /**
-     * @Description  项目详情
+     * @Description 项目详情
      * @Param processListFormDTO
      * @author zxc
      * @date 2020/10/23 10:33 上午
@@ -285,9 +285,9 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     /**
+     * @return
      * @Description 难点赌点-获取组织下拉框
      * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
-     * @return
      * @author jiangyy
      * @date 2020.10.19 16:38
      **/
@@ -297,7 +297,7 @@ public class ProjectServiceImpl implements ProjectService {
 
         //1、根据token获取本级agencyId、获取userId
         String agencyId = getLoginUserDetails(tokenDto);
-        String userId=getLoginUserUserId(tokenDto);
+        String userId = getLoginUserUserId(tokenDto);
 
         //2、获取本级组织机构
         Result<CustomerAgencyDTO> customerAgencyDTO = govOrgOpenFeignClient.getAgencyById(agencyId);
@@ -328,7 +328,7 @@ public class ProjectServiceImpl implements ProjectService {
             Result<SubAgencyResultDTO> SubAgencyResultDTO = govOrgOpenFeignClient.subAgencyList(form);
 
             List<SubListResultDTO> subAgencyList = SubAgencyResultDTO.getData().getAgencyList();
-            for(int i=0;i<subAgencyList.size();i++){
+            for (int i = 0; i < subAgencyList.size(); i++) {
                 ProjectNextAgencyResultDTO subAgencyDto = new ProjectNextAgencyResultDTO();
                 subAgencyDto.setOrgId(subAgencyList.get(i).getAgencyId());
                 subAgencyDto.setOrgName(subAgencyList.get(i).getAgencyName());
@@ -337,30 +337,30 @@ public class ProjectServiceImpl implements ProjectService {
             }
         }
 
-        if(null == resultList) return new ArrayList<>();
+        if (null == resultList) return new ArrayList<>();
         return resultList;
     }
 
     /**
-     * @Description 难点赌点-耗时最长|涉及部门最多|处理次数
-     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
      * @param param
      * @return
+     * @Description 难点赌点-耗时最长|涉及部门最多|处理次数
+     * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321614
      * @author jiangyy
      * @date 2020.10.19 16:38
      **/
-    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     public List<ProjectDifficultRankResultDTO> getDifficultyRank(DifficultyRankFormDTO param) {
         PageHelper.startPage(null == param.getPageNo() ? NumConstant.ONE:param.getPageNo(),param.getTopNum());
         List<ProjectDifficultRankResultDTO> result = projectDao.difficultyRank(param);
-        for (int i = 0; i < result.size (); i ++){
+        for (int i = 0; i < result.size(); i++) {
-            List<String> imgUrlList  ;
+            List<String> imgUrlList;
-            imgUrlList = projectDao.getDifficultyImgList(result.get(i).getProjectId()) ;
+            imgUrlList = projectDao.getDifficultyImgList(result.get(i).getProjectId());
 
             result.get(i).setImgUrlList(imgUrlList);
         }
-        if(null == result) return new ArrayList<>();
+        if (null == result) return new ArrayList<>();
         return result;
     }
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml

@@ -35,7 +35,8 @@
             IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO,
             IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO,
             IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
-            pa.AGENCY_NAME AS parentAgencyName
+            pa.AGENCY_NAME AS parentAgencyName,
+            rankData.MONTH_ID as monthId
             FROM screen_customer_agency agency
             left join screen_customer_agency pa
                 on(agency.PARENT_AREA_CODE=pa.AREA_CODE
@@ -61,7 +62,8 @@
             IFNULL(rankData.RESOLVED_RATIO,0) AS RESOLVED_RATIO,
             IFNULL(rankData.GOVERN_RATIO,0) AS GOVERN_RATIO,
             IFNULL(rankData.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
-            ca.agency_name AS parentAgencyName
+            ca.agency_name AS parentAgencyName,
+            rankData.MONTH_ID as monthId
             FROM screen_customer_grid grid
             left join screen_customer_agency ca
              on (ca.agency_id = grid.parent_agency_id)

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml

@@ -14,7 +14,8 @@
             rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio,
             rankData.SATISFACTION_RATIO AS satisfactionRatio,
             agency.AGENCY_NAME AS parentAgencyName,
-            rankData.ORG_ID as orgId
+            rankData.ORG_ID as orgId,
+            rankData.MONTH_ID
         FROM
             screen_org_rank_data rankData
         LEFT JOIN screen_customer_agency agency
@@ -39,7 +40,8 @@
                     rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio,
                     rankData.SATISFACTION_RATIO AS satisfactionRatio,
                     agency.AGENCY_NAME AS parentAgencyName,
-                    rankData.ORG_ID as orgId
+                    rankData.ORG_ID as orgId,
+                    rankData.MONTH_ID
             FROM
                     screen_org_rank_data rankData
             left join screen_customer_grid scg on(

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@@ -103,7 +103,8 @@
         SELECT
                 m.USER_ID,
                 concat( m.surname, CASE char_length( m.NAME ) WHEN 1 THEN '*' WHEN 2 THEN '**' ELSE '***' END )  AS name,
-                m.POINT_TOTAL AS point
+                m.POINT_TOTAL AS point,
+                m.DATA_END_TIME
         FROM
                 screen_party_user_rank_data m
         left join screen_customer_grid scg

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml

@@ -17,7 +17,8 @@
             publish_issue_total AS publishIssueTotal,
             IFNULL(publish_issue_ratio,0) AS publishIssueRatioA,
             PLAT_ISSUE_TOTAL AS platIssueTotal,
-            IFNULL(PLAT_JOIN_PARTY_RATIO,0) AS platJoinPartyRatio
+            IFNULL(PLAT_JOIN_PARTY_RATIO,0) AS platJoinPartyRatio,
+            DATA_END_TIME as dataEndTime
         FROM
             screen_pioneer_data
         WHERE
@@ -44,7 +45,8 @@
             CEILING(sum(data.publish_issue_total)) AS publishIssueTotal,
             IFNULL(avg(data.publish_issue_ratio),0) AS publishIssueRatioA,
             CEILING(sum(data.PLAT_ISSUE_TOTAL)) AS platIssueTotal,
-            IFNULL(avg(data.PLAT_JOIN_PARTY_RATIO),0) AS platJoinPartyRatio
+            IFNULL(avg(data.PLAT_JOIN_PARTY_RATIO),0) AS platJoinPartyRatio,
+            DATA_END_TIME as dataEndTime
         FROM
             screen_pioneer_data data
         LEFT JOIN

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml

@@ -38,7 +38,8 @@
             group_total AS groupNum,
             topic_total AS topicNum,
             issue_total AS issueNum,
-            project_total AS projectNum
+            project_total AS projectNum,
+            DATA_END_TIME as dataEndTime
         FROM
             screen_user_total_data
         WHERE

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml

@@ -5,7 +5,8 @@
     <select id="selectProjectProfile" resultType="com.epmet.evaluationindex.screen.dto.result.ProjectProfileResultDTO">
         SELECT ORG_ID,
                PROJECT_TOTAL,
-               LEVEL
+               LEVEL,
+               DATA_END_TIME as dataEndTime
         FROM screen_an_community_project_profile
         WHERE DEL_FLAG = 0
         AND CUSTOMER_ID = #{customerId}

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml

@@ -9,7 +9,8 @@
                CLOSED_PROJECT_TOTAL,
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ), '%' ) AS "projectResponseRatio",
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ), '%' ) AS "projectSatisRatio",
-               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio"
+               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio",
+               MONTH_ID
         FROM screen_an_grass_roots_govern_monthly
         WHERE DEL_FLAG = 0
         AND ORG_ID = #{agencyId}
@@ -55,7 +56,8 @@
                CLOSED_PROJECT_TOTAL,
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_RESPONSE_RATIO, 1 ) AS CHAR ), '%' ) AS "projectResponseRatio",
                CONCAT( 0 + cast( TRUNCATE ( PROJECT_SATIS_RATIO, 1 ) AS CHAR ), '%' ) AS "projectSatisRatio",
-               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio"
+               CONCAT( 0 + cast( TRUNCATE ( CLOSED_PROJECT_RATIO, 1 ) AS CHAR ), '%' ) AS "closedProjectRatio",
+               MONTH_ID
         FROM screen_an_grass_roots_govern_monthly
         WHERE DEL_FLAG = 0
           AND PID = #{agencyId}

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml

@@ -7,7 +7,8 @@
     <select id="selectGrassRootsOrg" resultType="com.epmet.evaluationindex.screen.dto.result.GrassRootsOrgResultDTO">
         SELECT GROUP_TOTAL,
                ISSUE_TOTAL,
-               PROJECT_TOTAL
+               PROJECT_TOTAL,
+               MONTH_ID
         FROM screen_an_grass_roots_org_monthly
         WHERE DEL_FLAG = 0
         AND ORG_ID = #{agencyId}
@@ -47,7 +48,8 @@
         SELECT ORG_NAME,
                GROUP_TOTAL,
                ISSUE_TOTAL,
-               PROJECT_TOTAL
+               PROJECT_TOTAL,
+               MONTH_ID
         FROM screen_an_grass_roots_org_monthly
         WHERE DEL_FLAG = 0
           AND PID = #{agencyId}

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml

@@ -7,7 +7,8 @@
         SELECT GROUP_MEMBER_TOTAL,
                TOPIC_TOTAL,
                TOPIC_PARTI_USER_TOTAL,
-               ISSUE_TOTAL
+               ISSUE_TOTAL,
+               MONTH_ID
         FROM screen_an_grass_roots_pm_total_monthly
         WHERE DEL_FLAG = '0'
           AND ORG_ID = #{agencyId}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java

@@ -54,11 +54,6 @@ public class ScreenProjectDataDTO implements Serializable {
      */
 	private String orgId;
 
-	/**
-	 * 来源：议题issue，组织agency
-	 */
-	private String origin;
-
     /**
      * 上级组织Id
      */
@@ -112,6 +107,16 @@ public class ScreenProjectDataDTO implements Serializable {
      */
 	private String projectAddress;
 
+	/**
+	 *  add 20211014
+	 * 项目所属编码，如果有多个，以英文顿号隔开
+	 */
+	private String categoryCode;
+	/**
+	 *  add 20211014
+	 * 来源：议题issue  项目立项:agency 事件:resi_event
+	 */
+	private String origin;
     /**
      * 所有分类名，用 - 连接
      */
@@ -185,4 +190,10 @@ public class ScreenProjectDataDTO implements Serializable {
 	 */
 	private BigDecimal satisfactionScore;
 
+
+
+	/**
+	 * fact_origin_project_main_daily.grid_id对应的网格名称
+	 */
+	private String tempGridName;
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java

@@ -81,6 +81,17 @@ public class ScreenProjectDataInfoFormDTO implements Serializable {
      */
     private String projectAddress;
 
+    /**
+     *  add 20211014
+     * 项目所属编码，如果有多个，以英文顿号隔开
+     */
+    private String categoryCode;
+    /**
+     *  add 20211014
+     * 来源：议题issue  项目立项:agency 事件:resi_event
+     */
+    private String origin;
+
     /**
      * 所有分类名，用 - 连接
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java

@@ -15,4 +15,7 @@ public interface PingYinConstant {
 
     String YU_SHAN_AGENCY_ID = "1258587398679126017";
     String YU_SHAN_CUSTOMER_ID = "a4bbf298d8e427844038cee466f022ef";
+
+    String TEST_PING_YIN_CUSTOMER_ID = "78e2b2227c07de1fe54da14e2b2d9eb6";
+    String PROD_PING_YIN_CUSTOMER_ID = "6f203e30de1a65aab7e69c058826cd80";
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -891,7 +891,6 @@ public class DemoController {
             formDTO.setCustomerId(customerId);
             formDTO.setDateId(param.getDateId());
             screenProjectSettleService.extractScreenData(param);
-            log.error(String.format("/data/stats/demo/project-test,screen_project_**表抽取完毕,customerId:%s", customerId));
         }
         return new Result();
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectCategoryDailyDao.java

@@ -42,7 +42,7 @@ public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginPro
      * @description 计算当前客户下，各个网格内，各项目分类下项目数量
      * @Date 2021/3/23 9:58
      **/
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(@Param("customerId") String customerId,@Param("subCount")Integer subCount);
 
     /**
      * @Description  查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】
@@ -50,7 +50,7 @@ public interface FactOriginProjectCategoryDailyDao extends BaseDao<FactOriginPro
      * @author zxc
      * @date 2021/4/13 下午4:36
      */
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(@Param("orgIds")List<String> orgIds,@Param("customerId") String customerId);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(@Param("orgIds")List<String> orgIds,@Param("customerId") String customerId,@Param("subCount") Integer subCount);
 
     int deleteByProjectIds(@Param("list") List<String> list);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenProjectDataEntity.java

@@ -109,6 +109,17 @@ public class ScreenProjectDataEntity extends BaseEpmetEntity {
      */
 	private String projectAddress;
 
+	/**
+	 *  add 20211014
+	 * 项目所属编码，如果有多个，以英文顿号隔开
+	 */
+	private String categoryCode;
+	/**
+	 *  add 20211014
+	 * 来源：议题issue  项目立项:agency 事件:resi_event
+	 */
+	private String origin;
+
     /**
      * 所有分类名，用 - 连接
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/healthcheck/HealthCheckController.java

@@ -1,12 +1,18 @@
 package com.epmet.healthcheck;
 
 import com.epmet.commons.tools.utils.Result;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 @RestController
 @RequestMapping("healthcheck")
+@Slf4j
 public class HealthCheckController {
 
     /**
@@ -15,7 +21,14 @@ public class HealthCheckController {
      */
     @PostMapping("http")
     public Result httpHealthCheck() {
-        return new Result();
+        InetAddress serverIp = null;
+        try {
+            serverIp = Inet4Address.getLocalHost();
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+        log.info("健康检查：serverName:{}", serverIp);
+        return new Result().ok(serverIp);
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java

@@ -182,7 +182,7 @@ public interface IssueService {
      * @author wangc
      * @date 2021.03.09 00:23
     */
-    Map<String,String> getIntegratedProjectCategory(Map<String, Set<String>> param,String customerId);
+    Map<String,List<String>> getIntegratedProjectCategory(Map<String, Set<String>> param,String customerId);
 
     /**
      * 获取议题总数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java

@@ -17,10 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * @author zhaoqifeng
@@ -157,18 +154,23 @@ public class IssueServiceImpl implements IssueService {
 	 * @date 2021.03.09 00:23
 	 */
 	@Override
-	public Map<String, String> getIntegratedProjectCategory(Map<String, Set<String>> param,String customerId) {
+	public Map<String, List<String>> getIntegratedProjectCategory(Map<String, Set<String>> param,String customerId) {
-		Map<String, String> map = new HashMap<>();
+		Map<String, List<String>> map = new HashMap<>();
     	param.forEach((projectId,categoryIds) -> {
     		//以下查询只适用于二级分类，如果分类层级变多了要修改此查询
 			List<IssueProjectCategoryDictDTO> categories = statsIssueDao.selectCategory(customerId, categoryIds);
 			if(!CollectionUtils.isEmpty(categories)){
-				StringBuilder str = new StringBuilder();
+				StringBuilder allCategoryName = new StringBuilder();
+				StringBuilder categoryCode = new StringBuilder();
 				categories.forEach(category -> {
-					str.append(category.getCategoryName()).append(StrConstant.COMMA);
+					allCategoryName.append(category.getCategoryName()).append(StrConstant.COMMA);
+					categoryCode.append(category.getCategoryCode()).append(StrConstant.COMMA);
 					//log.info(str.toString());
 				});
-				map.put(projectId,str.substring(NumConstant.ZERO,str.length() - NumConstant.ONE));
+				List<String> list=new ArrayList<>();
+				list.add(allCategoryName.substring(NumConstant.ZERO,allCategoryName.length() - NumConstant.ONE));
+				list.add(categoryCode.substring(NumConstant.ZERO,categoryCode.length() - NumConstant.ONE));
+				map.put(projectId,list);
 			}
 		});
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectCategoryDailyService.java

@@ -54,5 +54,5 @@ public interface FactOriginProjectCategoryDailyService extends BaseService<FactO
      * @author zxc
      * @date 2021/4/13 下午4:36
      */
-    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId);
+    List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectCategoryDailyServiceImpl.java

@@ -23,6 +23,8 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.constant.DataSourceConstant;
+import com.epmet.constant.PingYinConstant;
+import com.epmet.constant.PingYinConstants;
 import com.epmet.dao.evaluationindex.extract.FactOriginProjectCategoryDailyDao;
 import com.epmet.dto.ProjectCategoryDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
@@ -136,10 +138,18 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
      **/
     @Override
     public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryGridDailyDTO(String customerId) {
-        List<ScreenProjectCategoryGridDailyDTO> list=baseDao.selectListProjectCategoryGridDailyDTO(customerId);
+        List<ScreenProjectCategoryGridDailyDTO> list=baseDao.selectListProjectCategoryGridDailyDTO(customerId,getSubCount(customerId));
         return list;
     }
 
+    public Integer getSubCount(String customerId){
+        Integer result = NumConstant.FOUR;
+        if (customerId.equals(PingYinConstant.TEST_PING_YIN_CUSTOMER_ID) || customerId.equals(PingYinConstant.PROD_PING_YIN_CUSTOMER_ID)){
+            return NumConstant.TWO;
+        }
+        return result;
+    }
+
     /**
      * @Description  查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】
      * @Param orgIds
@@ -147,10 +157,10 @@ public class FactOriginProjectCategoryDailyServiceImpl extends BaseServiceImpl<F
      * @date 2021/4/13 下午4:36
      */
     @Override
-    public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId) {
+    public List<ScreenProjectCategoryGridDailyDTO> selectListProjectCategoryByOrg(List<String> orgIds,String customerId,Integer subCount) {
         if (!CollectionUtils.isEmpty(orgIds)){
             return new ArrayList<>();
         }
-        return baseDao.selectListProjectCategoryByOrg(orgIds,customerId);
+        return baseDao.selectListProjectCategoryByOrg(orgIds,customerId,subCount);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java

@@ -209,6 +209,10 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         imgMap.values().forEach(imgList::addAll);
 
         //立案后会有 一个process 如果没有则说明是垃圾数据 如果有其他方式立项的项目则需要考虑下兼容
+        difficulties.removeIf(diff -> StringUtils.isBlank(diff.getLatestOperateDesc()));
+
+        screenDifficultyDataService.dataClean(param.getCustomerId(), difficulties, imgList);
+        log.info("【大屏数据抽取-难点赌点执行完毕】 客户Id{} 难点赌点数据{}", param.getCustomerId(), JSON.toJSONString(difficulties));
         difficulties.removeIf( diff -> StringUtils.isBlank(diff.getLatestOperateDesc()));
         imgList.forEach(item -> {
             item.setCustomerId(param.getCustomerId());

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java

@@ -81,30 +81,47 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 			List<ProjectEntity> info = projectService.getProjectInfo(metaData.stream().map(ScreenProjectDataDTO::getProjectId).collect(Collectors.toList()));
 			if(!CollectionUtils.isEmpty(info)){
 				metaData = metaData.stream().flatMap(meta -> info.stream().filter(nature -> StringUtils.equals(meta.getProjectId(),
-						nature.getId())).map(projectInfo -> {
+					nature.getId())).map(projectInfo -> {
-							meta.setProjectCreateTime(projectInfo.getCreatedTime());
+					meta.setProjectCreateTime(projectInfo.getCreatedTime());
-							meta.setProjectTitle(projectInfo.getTitle());
+					meta.setProjectTitle(projectInfo.getTitle());
-							meta.setOrigin(projectInfo.getOrigin());
+					meta.setOrigin(projectInfo.getOrigin());
-							//直接立项的话 项目内容是项目背景 经纬度添加
+					if (ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(projectInfo.getOrigin())) {
-							if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(projectInfo.getOrigin())){
+
-								meta.setOrgType(OrgTypeConstant.AGENCY);
+						//来源于议题的，上面的initNewScreenProjectData，已经赋值orgType=grid, orgId:gridId
-								meta.setOrgId(projectInfo.getAgencyId());
+						meta.setOrgName(meta.getTempGridName());
-								meta.setProjectContent(projectInfo.getBackGround());
+						//A:如果是来源于议题，linkUserId为话题的发布人id;
-								meta.setLinkUserId(projectInfo.getCreatedBy());
+						meta.setLinkUserId(meta.getLinkName());
-								meta.setLinkName(projectInfo.getCreatedBy());
+
-								if (StringUtils.isNotBlank(projectInfo.getLocateDimension())){
+					}else if(ProjectConstant.PROJECT_ORIGIN_EVENT.equals(projectInfo.getOrigin())){
-									meta.setLatitude(new BigDecimal(projectInfo.getLocateDimension()));
+
-								}
+						meta.setProjectContent(projectInfo.getBackGround());
-								if (StringUtils.isNotBlank(projectInfo.getLocateLongitude())){
+						meta.setLatitude(new BigDecimal(projectInfo.getLocateDimension()));
-									meta.setLongitude(new BigDecimal(projectInfo.getLocateLongitude()));
+						meta.setLongitude(new BigDecimal(projectInfo.getLocateLongitude()));
-								}
+						meta.setProjectAddress(projectInfo.getLocateAddress());
-								meta.setProjectAddress(projectInfo.getLocateAddress());
+						meta.setOrgType(OrgTypeConstant.AGENCY);
-							} else {
+						meta.setOrgId(projectInfo.getAgencyId());
-								meta.setLinkUserId(meta.getLinkName());
+						//B:如果是来源是居民端报事，此列实际为空;
-							}
+						meta.setLinkUserId(meta.getLinkName());
-							//项目满意度得分
+
-							meta.setSatisfactionScore(projectService.calProjectSatisfactionScore(param.getCustomerId(),meta.getProjectId()));
+					}else if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(projectInfo.getOrigin())) {
-							return meta;
+						//直接立项的话 项目内容是项目背景 经纬度添加
+						meta.setOrgType(OrgTypeConstant.AGENCY);
+						meta.setOrgId(projectInfo.getAgencyId());
+						//上面的initNewScreenProjectData已经赋值了orgName=组织名称
+						meta.setProjectContent(projectInfo.getBackGround());
+						meta.setLinkUserId(projectInfo.getCreatedBy());
+						meta.setLinkName(projectInfo.getCreatedBy());
+						if (StringUtils.isNotBlank(projectInfo.getLocateDimension())) {
+							meta.setLatitude(new BigDecimal(projectInfo.getLocateDimension()));
+						}
+						if (StringUtils.isNotBlank(projectInfo.getLocateLongitude())) {
+							meta.setLongitude(new BigDecimal(projectInfo.getLocateLongitude()));
+						}
+						meta.setProjectAddress(projectInfo.getLocateAddress());
+					}
+					//项目满意度得分
+					meta.setSatisfactionScore(projectService.calProjectSatisfactionScore(param.getCustomerId(),meta.getProjectId()));
+					return meta;
 				})).collect(Collectors.toList());
 			}
 			//设置项目经纬度和项目内容
@@ -129,13 +146,25 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 		}
 		Map<String, Set<String>> categoryMap = projectService.getProjectCategory(projectIds);
 		if(!CollectionUtils.isEmpty(categoryMap)){
-			Map<String, String> integratedProjectCategoryMap = issueService.getIntegratedProjectCategory(categoryMap, param.getCustomerId());
+			Map<String, List<String>> integratedProjectCategoryMap = issueService.getIntegratedProjectCategory(categoryMap, param.getCustomerId());
 			if(!CollectionUtils.isEmpty(integratedProjectCategoryMap)){
 				metaData.forEach(meta -> {
-					meta.setAllCategoryName(integratedProjectCategoryMap.get(meta.getProjectId()));
+					List<String> list1=integratedProjectCategoryMap.get(meta.getProjectId());
+					if(!CollectionUtils.isEmpty(list1)){
+						meta.setAllCategoryName(list1.get(0));
+						meta.setCategoryCode(list1.get(1));
+					}else{
+						log.warn("1、projectId="+meta.getProjectId()+" category is null");
+					}
 				});
 				orientData.forEach(orient -> {
-					orient.setAllCategoryName(integratedProjectCategoryMap.get(orient.getProjectId()));
+					List<String> list2=integratedProjectCategoryMap.get(orient.getProjectId());
+					if(!CollectionUtils.isEmpty(list2)){
+						orient.setAllCategoryName(list2.get(0));
+						orient.setCategoryCode(list2.get(1));
+					}else{
+						log.warn("2、projectId="+orient.getProjectId()+" category is null");
+					}
 				});
 			}
 		}
@@ -168,7 +197,7 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 			}
 		}
 
-
+		log.error(String.format("/data/stats/demo/project-test,screen_project_**表抽取完毕,customerId:%s", param.getCustomerId()));
 	}
 
 	/**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java

@@ -17,6 +17,7 @@
 
 package com.epmet.service.evaluationindex.screen.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -142,6 +143,13 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
                     exists.setAllParentNames(e.getAllParentName());
                     exists.setParentAreaCode(e.getParentAreaCode());
                     updateAgency(exists);
+
+                    // 已删除数据的处理
+                    if ("1".equals(e.getDelFlag())) {
+                        LambdaQueryWrapper<ScreenCustomerAgencyEntity> w = new LambdaQueryWrapper<>();
+                        w.eq(ScreenCustomerAgencyEntity::getAgencyId, e.getId());
+                        screenCustomerAgencyDao.delete(w);
+                    }
                 }
             }
         }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerDeptServiceImpl.java

@@ -17,6 +17,7 @@
 
 package com.epmet.service.evaluationindex.screen.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -90,6 +91,13 @@ public class ScreenCustomerDeptServiceImpl extends BaseServiceImpl<ScreenCustome
                 e.setCustomerId(dept.getCustomerId());
                 e.setAreaCode(dept.getAreaCode());
                 screenCustomerDeptDao.updateById(e);
+
+                // 已删除数据的处理
+                if ("1".equals(dept.getDelFlag())) {
+                    LambdaQueryWrapper<ScreenCustomerDeptEntity> w = new LambdaQueryWrapper<>();
+                    w.eq(ScreenCustomerDeptEntity::getDeptId, dept.getId());
+                    screenCustomerDeptDao.delete(w);
+                }
             }
         }
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java

@@ -18,6 +18,7 @@
 package com.epmet.service.evaluationindex.screen.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java

@@ -280,7 +280,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         // 组织项目分类 项目数
         List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
         if (!CollectionUtils.isEmpty(levelAgencyInfo)){
-            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId);
+            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId,NumConstant.FOUR);
             if (!CollectionUtils.isEmpty(result)){
                 if (!CollectionUtils.isEmpty(screenProjectCategory)){
                     result.forEach(r -> {
@@ -496,7 +496,7 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
         List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
         if (!CollectionUtils.isEmpty(levelAgencyInfo)) {
             // 查询客户下，组织直接立项的，各项目分类下的项目数量【筛选组织创建的项目，fact_origin_project_main_daily表gridId为空】
-            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId);
+            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds, customerId,NumConstant.TWO);
             log.info("直接立项的统计:"+screenProjectCategory);
             if (!CollectionUtils.isEmpty(result)) {
                 if (!CollectionUtils.isEmpty(screenProjectCategory)) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java

@@ -106,6 +106,10 @@ public class StatsDimServiceImpl implements StatsDimService {
                     dimGrid.setGridName(updatedGrid.getGridName());
                     dimGrid.setUpdatedTime(now);
                     dimGrid.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
+                    dimGrid.setDelFlag(updatedGrid.getDelFlag());
+                    dimGrid.setAgencyId(updatedGrid.getPid());
+                    dimGrid.setAreaCode(updatedGrid.getAreaCode());
+                    dimGrid.setCustomerId(updatedGrid.getCustomerId());
                     dimGrids.add(dimGrid);
                 }
             }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java

@@ -51,6 +51,7 @@ public interface CustomerAgencyService {
      */
     CustomerAgencyEntity getAgencyByDeptId(String deptId);
 
+
     /**
      * 将孔村、榆山、锦水3个街道的组织插入到gov-org库的customer_agency
      *

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java

@@ -69,31 +69,6 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
         return customerAgencyDao.getRootAgencyInfo(customerId);
     }
 
-    /**
-     * 获取每个组织、每个网格下工作人员userId集合
-     *
-     * @param customerId
-     * @return com.epmet.dto.org.result.OrgStaffResultDTO
-     */
-    @Override
-    public List<OrgStaffDTO> queryOrgStaffIds(String customerId) {
-        List<OrgStaffDTO> resultList=new ArrayList<>();
-        List<CustomerAgencyEntity> list=customerAgencyDao.selectListByCustomerId(customerId);
-        for(CustomerAgencyEntity agencyEntity:list){
-            List<String> agencyStaffIds=customerAgencyDao.selectAgencyStaffIds(customerId,agencyEntity.getId());
-            if(!CollectionUtils.isEmpty(agencyStaffIds)){
-                OrgStaffDTO agencyStaffDTO=new OrgStaffDTO();
-                agencyStaffDTO.setOrgId(agencyEntity.getId());
-                agencyStaffDTO.setOrgType("agency");
-                agencyStaffDTO.setStaffIds(agencyStaffIds);
-                resultList.add(agencyStaffDTO);
-            }
-        }
-        List<OrgStaffDTO> gridStaffIds=customerAgencyDao.selectGridStaffIds(customerId);
-        resultList.addAll(gridStaffIds);
-        return resultList;
-    }
-
     @Override
     public List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId) {
         return customerAgencyDao.queryAgencyListByCustomerId(customerId);
@@ -121,6 +96,31 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
         return customerAgencyDao.selectByDeptId(deptId);
     }
 
+    /**
+     * 获取每个组织、每个网格下工作人员userId集合
+     *
+     * @param customerId
+     * @return com.epmet.dto.org.result.OrgStaffResultDTO
+     */
+    @Override
+    public List<OrgStaffDTO> queryOrgStaffIds(String customerId) {
+        List<OrgStaffDTO> resultList=new ArrayList<>();
+        List<CustomerAgencyEntity> list=customerAgencyDao.selectListByCustomerId(customerId);
+        for(CustomerAgencyEntity agencyEntity:list){
+            List<String> agencyStaffIds=customerAgencyDao.selectAgencyStaffIds(customerId,agencyEntity.getId());
+            if(!CollectionUtils.isEmpty(agencyStaffIds)){
+                OrgStaffDTO agencyStaffDTO=new OrgStaffDTO();
+                agencyStaffDTO.setOrgId(agencyEntity.getId());
+                agencyStaffDTO.setOrgType("agency");
+                agencyStaffDTO.setStaffIds(agencyStaffIds);
+                resultList.add(agencyStaffDTO);
+            }
+        }
+        List<OrgStaffDTO> gridStaffIds=customerAgencyDao.selectGridStaffIds(customerId);
+        resultList.addAll(gridStaffIds);
+        return resultList;
+    }
+
     /**
      * 将孔村、榆山、锦水3个街道的组织插入到gov-org库的customer_agency
      *
@@ -245,7 +245,7 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
      * @param parentCustomerEntity 在平阴客户里，网格所属组织信息
      * @author yinzuomei
      * @description 将3个街道的网格，插入到gov-org.customer_grid库
-     * @Date 2021/7/7 9:54 
+     * @Date 2021/7/7 9:54
      **/
     private void insertCustomerGrid(String customerId, String agencyId, CustomerAgencyEntity parentCustomerEntity) {
         List<ScreenCustomerGridEntity> gridEntityList = screenCustomerGridService.selectEntityByAgencyId(customerId, agencyId);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java

@@ -84,7 +84,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
      */
     @Override
     public List<CustomerStaffGridDTO> getCustomerStaffGridList(String customerId) {
-        return customerGridDao.getCustomerStaffGridList(customerId);
+        return baseDao.getCustomerStaffGridList(customerId);
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimAgencyServiceImpl.java

@@ -139,9 +139,18 @@ public class DimAgencyServiceImpl extends BaseServiceImpl<DimAgencyDao, DimAgenc
             if (existsDimAgency != null) {
                 //说明是已存在的，不是新增的
                 existsDimAgency.setAgencyName(agency.getOrganizationName());
+                existsDimAgency.setAllParentName(agency.getAllParentName());
+                existsDimAgency.setCustomerId(agency.getCustomerId());
+                existsDimAgency.setLevel(agency.getLevel());
+                existsDimAgency.setPid(agency.getPid());
+                existsDimAgency.setPids(agency.getPids());
                 existsDimAgency.setUpdatedTime(initTime);
                 existsDimAgency.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
                 baseDao.updateById(existsDimAgency);
+
+                if ("1".equals(agency.getDelFlag())) {
+                    baseDao.deleteById(agency.getId());
+                }
             }
         }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java

@@ -146,6 +146,10 @@ public class DimCustomerServiceImpl extends BaseServiceImpl<DimCustomerDao, DimC
                 existsCustomerDim.setUpdatedTime(initTime);
                 existsCustomerDim.setAreaCode(updatedCustomer.getAreaCode());
                 baseDao.updateById(existsCustomerDim);
+
+                if ("1".equals(updatedCustomer.getDelFlag())) {
+                    baseDao.deleteById(updatedCustomer.getId());
+                }
             }
         }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimDepartmentServiceImpl.java

@@ -132,9 +132,15 @@ public class DimDepartmentServiceImpl extends BaseServiceImpl<DimDepartmentDao,
             DimDepartmentEntity dimDepartment = baseDao.selectById(updatedDepartment.getId());
             if (dimDepartment != null) {
                 dimDepartment.setDepartmentName(updatedDepartment.getDepartmentName());
+                dimDepartment.setAgencyId(updatedDepartment.getAgencyId());
+                dimDepartment.setCustomerId(updatedDepartment.getCustomerId());
                 dimDepartment.setUpdatedBy(RobotConstant.DIMENSION_ROBOT);
                 dimDepartment.setUpdatedTime(initTime);
                 baseDao.updateById(dimDepartment);
+
+                if ("1".equals(updatedDepartment.getDelFlag())) {
+                    baseDao.deleteById(updatedDepartment.getId());
+                }
             }
         }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java

@@ -128,6 +128,10 @@ public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntit
 
         for (DimGridEntity updatedGridDim : changedGrids) {
             baseDao.updateById(updatedGridDim);
+            if ("1".equals(updatedGridDim.getDelFlag())) {
+                // 如果已经被删除了，那么这里也做删除操作
+                baseDao.deleteById(updatedGridDim.getId());
+            }
         }
 
         lastExecRecordDao.updateExecTimeBySubject(new Date(), StatsSubject.DIM_GRID);

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.2__dim_ag_add_col_type.sql

@@ -1,2 +1,2 @@
-/*ALTER TABLE dim_agency ADD COLUMN AGENCY_DIM_TYPE VARCHAR(10) NOT NULL COMMENT '机关维度类型。self:机关本身自己,all:机关自己+下级+网格+部门等';*/
+#ALTER TABLE dim_agency ADD COLUMN AGENCY_DIM_TYPE VARCHAR(10) NOT NULL COMMENT '机关维度类型。self:机关本身自己,all:机关自己+下级+网格+部门等';
 select 1;

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml

@@ -55,7 +55,7 @@
                 union all
             SELECT
                 c.CUSTOMER_ID,
-                left(c.CATEGORY_CODE, 4) as CATEGORY_CODE,
+                left(c.CATEGORY_CODE, #{subCount}) as CATEGORY_CODE,
                 '1'as `LEVEL`,
                 p.GRID_ID,
                 p.AGENCY_ID AS PID,
@@ -70,7 +70,7 @@
                 AND c.CUSTOMER_ID = #{customerId}
             GROUP BY
                 c.CUSTOMER_ID,
-                left(c.CATEGORY_CODE, 4),
+                left(c.CATEGORY_CODE, #{subCount}),
                 c.`LEVEL`,
                 p.GRID_ID,
                 p.AGENCY_ID,
@@ -104,7 +104,7 @@
         SELECT
             c.CUSTOMER_ID,
             c.CUSTOMER_ID AS categoryOriginCustomerId,
-            left(c.CATEGORY_CODE, 4) AS CATEGORY_CODE,
+            left(c.CATEGORY_CODE, #{subCount}) AS CATEGORY_CODE,
             '1' AS `LEVEL`,
             p.AGENCY_ID AS orgId,
             p.PID AS PID,
@@ -120,6 +120,6 @@
               </foreach>
           )
          AND p.GRID_ID = ''
-        GROUP BY c.CUSTOMER_ID, left(c.CATEGORY_CODE, 4), c.`LEVEL`, p.PID, p.AGENCY_ID, P.PIDS
+        GROUP BY c.CUSTOMER_ID, left(c.CATEGORY_CODE, #{subCount}), c.`LEVEL`, p.PID, p.AGENCY_ID, P.PIDS
     </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

@@ -578,10 +578,12 @@
             data.PIDS as allParentIds,
             data.TOPIC_ID,
             IFNULL(log.response, 0) AS responseCount,
-            #{dataEndTime} as dataEndTime
+            #{dataEndTime} as dataEndTime,
-
+            data.ORIGIN as origin,
+            grid.GRID_NAME as tempGridName
         FROM `fact_origin_project_main_daily` data
-        LEFT JOIN DIM_AGENCY agency on data.agency_id = agency.id
+        LEFT JOIN DIM_AGENCY agency on (data.agency_id = agency.id and agency.del_flag='0')
+        LEFT JOIN DIM_GRID grid on (data.grid_id=grid.id and grid.del_flag='0')
         LEFT JOIN (
             SELECT PROJECT_ID, COUNT(IS_ACTIVE)  AS response FROM fact_origin_project_log_daily
             WHERE (ACTION_CODE = 'close' OR ACTION_CODE = 'response'  OR ACTION_CODE = 'transfer' OR ACTION_CODE = 'return')

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml

@@ -427,32 +427,33 @@
         (SELECT DEPT_ID AS orgId FROM screen_customer_dept WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId})
     </select>
 
-    <!-- 查询顶级组织ID -->
+    <!-- 查询客户下所有的组织的上级组织 -->
-    <select id="selectTopAgency" resultType="com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity">
+    <select id="selectAgencyIdAndParentId" resultType="com.epmet.dto.indexcal.AgencyAndParentResultDTO">
         SELECT
             AGENCY_ID,
-            PID,
+            PID
-            PIDS
         FROM
             screen_customer_agency
         WHERE
-            DEL_FLAG = '0'
+            DEL_FLAG = 0
-          AND PID = '0'
           AND CUSTOMER_ID = #{customerId}
     </select>
 
-    <!-- 查询客户下所有的组织的上级组织 -->
+    <!-- 查询顶级组织ID -->
-    <select id="selectAgencyIdAndParentId" resultType="com.epmet.dto.indexcal.AgencyAndParentResultDTO">
+    <select id="selectTopAgency" resultType="com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity">
         SELECT
             AGENCY_ID,
-            PID
+            PID,
+            PIDS
         FROM
             screen_customer_agency
         WHERE
-            DEL_FLAG = 0
+            DEL_FLAG = '0'
+          AND PID = '0'
           AND CUSTOMER_ID = #{customerId}
     </select>
 
+
     <select id="selectRootAgency" parameterType="java.lang.String" resultType="com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity">
         SELECT
             *

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml

@@ -311,7 +311,8 @@
     <select id="selectCategory" resultType="com.epmet.dto.issue.IssueProjectCategoryDictDTO">
         SELECT
         a.ID,
-        IF(a.CATEGORY_TYPE = '2',concat(b.CATEGORY_NAME,'-',a.CATEGORY_NAME),a.CATEGORY_NAME) as categoryName
+        IF(a.CATEGORY_TYPE = '2',concat(b.CATEGORY_NAME,'-',a.CATEGORY_NAME),a.CATEGORY_NAME) as categoryName,
+        a.category_code as categoryCode
         FROM issue_project_category_dict a
         LEFT JOIN issue_project_category_dict b on a.pid = b.id and a.customer_id = b.customer_id
         WHERE a.DEL_FLAG = '0'

epmet-module/epmet-activiti/epmet-activiti-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-activiti</artifactId>

epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java

@@ -3,6 +3,16 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.CostDayFormDTO;
+import com.epmet.dto.form.ExternalAppAuthFormDTO;
+import com.epmet.dto.form.GetJwtAccessTokenFormDTO;
+import com.epmet.dto.form.WorkDayFormDTO;
+import com.epmet.dto.result.AppIdInfoResultDTO;
+import com.epmet.dto.form.WorkMinuteFormDTO;
+import com.epmet.dto.result.CostDayResultDTO;
+import com.epmet.dto.result.AppIdInfoResultDTO;
+import com.epmet.dto.result.ExternalAppAuthResultDTO;
+import com.epmet.dto.result.WorkDayResultDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql

@@ -1,7 +1,7 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : 外网192.168.1.130
+ Source Server         : 外网192.168.1.140
  Source Server Type    : MySQL
  Source Server Version : 50728
  Source Host           : 118.190.150.119:47306

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java

@@ -46,6 +46,7 @@ public class ScheduleConfig {
         prop.put("org.quartz.jobStore.misfireThreshold", "12000");
         prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
         prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
+        prop.put("org.quartz.jobStore.acquireTriggersWithinLock", "true");
 
         //PostgreSQL数据库，需要打开此注释
         //prop.put("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate");

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java

@@ -111,7 +111,7 @@ public class SystemMessageServiceImpl implements SystemMessageService {
         switch (msgType) {
             case SystemMessageType.INIT_CUSTOMER:
                 topic = TopicConstants.INIT_CUSTOMER;
-            break;
+                break;
             case SystemMessageType.PROJECT_CHANGED:
                 topic = TopicConstants.PROJECT_CHANGED;
                 break;

epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java

@@ -11,7 +11,6 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.UploadImgResultDTO;
-import com.epmet.feign.fallback.OssFeignClientFallback;
 import com.epmet.feign.fallback.OssFeignClientFallbackFactory;
 import feign.codec.Encoder;
 import feign.form.spring.SpringFormEncoder;
@@ -32,7 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
 @FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallbackFactory =
         OssFeignClientFallbackFactory.class)
 //@FeignClient(name = ServiceConstant.EPMET_OSS_SERVER, configuration = OssFeignClient.MultipartSupportConfig.class, fallbackFactory =
-//        OssFeignClientFallbackFactory.class)
+//        OssFeignClientFallbackFactory.class, url = "localhost:8083")
 public interface OssFeignClient {
     /**
      * 文件上传
@@ -64,4 +63,13 @@ public interface OssFeignClient {
         }
     }
 
+    /**
+     * @Description ribbon测试
+     * @return
+     * @author wxz
+     * @date 2021.08.05 16:28
+     */
+    @PostMapping("/oss/test/test-ribbon-rcv/{sleep}")
+    Result testRibbonRcv(@RequestParam("sleep") Long sleep);
+
 }

epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java

@@ -13,7 +13,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.feign.OssFeignClient;
-import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -40,4 +40,9 @@ public class OssFeignClientFallback implements OssFeignClient {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "uploadQrCodeV2", file, customerId);
 	}
 
+	@Override
+	public Result testRibbonRcv(@PathVariable Long sleep) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "testRibbonRcv", sleep);
+	}
+
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java

@@ -0,0 +1,68 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.service.OssService;
+import org.apache.commons.io.FileUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+@RestController
+@RequestMapping("test")
+public class TestController {
+
+    @Autowired
+    private OssService ossService;
+
+    @PostMapping("local-upload")
+    public Result localUpload(@RequestPart("file") MultipartFile file, @RequestParam("fileName") String fileName) {
+
+        final File tempFile = new File("/opt/upload_files/" + fileName);
+
+        try(InputStream inputStream = file.getInputStream()) {
+            FileUtils.copyInputStreamToFile(inputStream, tempFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new Result();
+    }
+
+    @PostMapping("upload2aliyun")
+    public Result upload2aliyun(@RequestParam("fileName") String fileName) {
+        try (final FileInputStream fis = new FileInputStream("/opt/upload_files/" + fileName)) {
+            final MockMultipartFile mockMultipartFile = new MockMultipartFile(fileName, fis);
+            return ossService.uploadImg(mockMultipartFile, null);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new Result();
+    }
+
+    /**
+     * @Description ribbon测试
+     * @return
+     * @author wxz
+     * @date 2021.08.05 16:28
+    */
+    @PostMapping("test-ribbon-rcv/{sleep}")
+    public Result testRibbonRcv(@PathVariable("sleep") Long sleep) {
+        InetAddress localHost = null;
+        try {
+            Thread.sleep(sleep);
+            localHost = Inet4Address.getLocalHost();
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        return new Result().ok(localHost);
+    }
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java

@@ -18,13 +18,13 @@ public class GroupPointFormDTO implements Serializable {
 
 	public interface GroupPoint extends CustomerClientShowGroup {}
 	public interface GridRank extends CustomerClientShowGroup {}
-	public interface PointRank extends CustomerClientShowGroup {}
 	public interface GridScopeRank {}
 	public interface CustomerScopeRank {}
 	public interface MyGroupRank {}
+	public interface PointRank extends CustomerClientShowGroup {}
 	@NotBlank(message = "小组Id不能为空", groups = {GroupPoint.class, GridRank.class})
 	private String groupId;
-	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, PointRank.class, GridScopeRank.class, MyGroupRank.class})
+	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, GridScopeRank.class, MyGroupRank.class, PointRank.class})
 	private String gridId;
 	@NotBlank(message = "客户Id不能为空", groups = {CustomerScopeRank.class})
 	private String customerId;

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.42</version>
+    <version>0.0.44</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__point_rule_sort.sql

@@ -2,8 +2,6 @@ alter table point_rule_default add COLUMN SORT INT(11) COMMENT '规则显示顺
 alter table point_rule add COLUMN SORT INT(11) COMMENT '规则显示顺序' AFTER ENABLED_FLAG ;
 alter table point_rule_default add COLUMN LINK_PAGE VARCHAR(32) COMMENT '链接页面' AFTER SORT ;
 alter table point_rule add COLUMN LINK_PAGE VARCHAR(32) COMMENT '链接页面' AFTER SORT ;
-alter table point_rule_default add COLUMN DISPOSABLE varchar(1) not null default '0' comment '一次性任务？1:是;0:不是' AFTER LINK_PAGE;
-alter table point_rule add COLUMN DISPOSABLE varchar(1) not null default '0' comment '一次性任务？1:是;0:不是' AFTER LINK_PAGE;
 
 update point_rule_default set sort='1001',LINK_PAGE='group' where EVENT_CODE='participate_one_topic' and DEL_FLAG='0';
 update point_rule_default set sort='1002',LINK_PAGE='group' where EVENT_CODE='publish_one_topic' and DEL_FLAG='0';
@@ -13,7 +11,7 @@ update point_rule_default set sort='1005',LINK_PAGE='group' where EVENT_CODE='le
 update point_rule_default set sort='1006',LINK_PAGE='group' where EVENT_CODE='shift_topic_to_issue' and DEL_FLAG='0';
 update point_rule_default set sort='1007',LINK_PAGE='group' where EVENT_CODE='topic_to_issue' and DEL_FLAG='0';
 update point_rule_default set sort='1008',LINK_PAGE='group' where EVENT_CODE='topic_to_project' and DEL_FLAG='0';
-update point_rule_default set sort='2001',LINK_PAGE='heart',DISPOSABLE='1' where EVENT_CODE='register_volunteer' and DEL_FLAG='0';
+update point_rule_default set sort='2001',LINK_PAGE='heart' where EVENT_CODE='register_volunteer' and DEL_FLAG='0';
 update point_rule_default set sort='2002',LINK_PAGE='heart' where EVENT_CODE='active_insert_live' and DEL_FLAG='0';
 
 
@@ -25,5 +23,5 @@ update point_rule set sort='1005',LINK_PAGE='group' where EVENT_CODE='leader_res
 update point_rule set sort='1006',LINK_PAGE='group' where EVENT_CODE='shift_topic_to_issue' and DEL_FLAG='0';
 update point_rule set sort='1007',LINK_PAGE='group' where EVENT_CODE='topic_to_issue' and DEL_FLAG='0';
 update point_rule set sort='1008',LINK_PAGE='group' where EVENT_CODE='topic_to_project' and DEL_FLAG='0';
-update point_rule set sort='2001',LINK_PAGE='heart' ,DISPOSABLE='1' where EVENT_CODE='register_volunteer' and DEL_FLAG='0';
+update point_rule set sort='2001',LINK_PAGE='heart' where EVENT_CODE='register_volunteer' and DEL_FLAG='0';
 update point_rule set sort='2002',LINK_PAGE='heart' where EVENT_CODE='active_insert_live' and DEL_FLAG='0';

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ThirdPlatformController.java

@@ -28,7 +28,7 @@ public class ThirdPlatformController {
     private ThirdPlatformService thirdPlatformService;
 
     /**
-     * 根据客户id和动作，列出客户登记可用的第三方平台
+     * 根据客户id和动作，列出客户在指定动作下可用的第三方平台
      * 用途：工作端，运营端配置界面
      *
      * @param input

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java

@@ -21,7 +21,7 @@ public class MenuConfigFormDTO implements Serializable {
 
     /**
      * 客户id 列表
+     *  列表为空，则所有客户都不配置这个菜单了。
      */
-    @NotBlank(message = "客户id 列表不能为空")
     private List<String> customerIds;
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java

@@ -106,9 +106,8 @@ public class GovCustomerMenuServiceImpl extends BaseServiceImpl<GovCustomerMenuD
 
     @Override
     public void saveCustomerMenu(MenuConfigFormDTO formDTO) {
+        baseDao.deleteBatchTableIds(formDTO.getTableId());
         if (NumConstant.ZERO < formDTO.getCustomerIds().size()) {
-            baseDao.deleteBatchTableIds(formDTO.getTableId());
-
             List<GovCustomerMenuEntity> entities = new ArrayList<>();
             for (String customerId : formDTO.getCustomerIds()) {
                 GovCustomerMenuEntity entity = new GovCustomerMenuEntity();

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -2,6 +2,9 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.IssueApplicationDTO;
+import com.epmet.dto.IssueDTO;
+import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -3,6 +3,9 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.IssueApplicationDTO;
+import com.epmet.dto.IssueDTO;
+import com.epmet.dto.IssueSuggestionDTO;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java

@@ -102,6 +102,7 @@ public class IssueProjectTagDictRedis {
 
         //查询客户的“其他"分类的Id
         IssueProjectCategoryDictEntity otherCategory = categoryDictDao.selectSingleByCustomerIdAndCategoryNameAndCategoryType(customerId, ModuleConstants.CATEGORY_NAME_OTHERS, null);
+        //是否传入的类别Id中只包含"其他"分类，因为自定义分类和默认分类排序规则不一样
         //判断入参是否是只有一个分类Id并且是"其他"的Id
         boolean ifOtherOnly = null == otherCategory ? false : (!CollectionUtils.isEmpty(category) && category.size() == NumConstant.ONE && category.contains(otherCategory.getId()) ? true : false);
 
@@ -409,6 +410,18 @@ public class IssueProjectTagDictRedis {
         redisUtils.zSetAdd(key,o);
     }
 
+    /**
+     * @Description 给客户下的分类/标签批量增加/减少热度
+     * param   :
+     *              key     : 0  代表减一     1 代表加一
+     *              value   :
+     *                          key     : 某一客户下分类/标签的redisKey
+     *                          value  :  需要修改的分类/标签
+     * @param param
+     * @return void
+     * @author wangc
+     * @date 2021.03.20 01:04
+    */
     public void batchIncrScore(Map<String,Map<String,List<IssueCategoryTagResultDTO>>> param){
         if(CollectionUtils.isEmpty(param)) return;
         redisTemplate.executePipelined((RedisCallback) connection -> {

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -618,4 +618,4 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         return collect;
     }
 
-}
+}

epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml

@@ -28,6 +28,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+      #监控页面
+      stat-view-servlet:
+        enabled: true
+        #loginUsername: admin
+        #loginPassword: admin
+        allow:
+      web-stat-filter:
+        enabled: true
+      filters: stat,log4j2
   cloud:
     nacos:
       discovery:

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java

@@ -37,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 import java.util.Map;
 
@@ -154,6 +153,12 @@ public class CustomerProjectParameterController {
         return new Result();
     }
 
+    /**
+     * @Description 保存项目第三方平台的配置
+     * @return
+     * @author wxz
+     * @date 2021.03.19 17:10
+    */
     @PostMapping("save-thirdplatform-config")
     public Result saveThirdplatformConfig(@RequestBody ThirdPlatformConfigFormDTO input) {
         ValidatorUtils.validateEntity(input, ThirdPlatformConfigFormDTO.SaveThirdplatformConfig.class);

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java

@@ -64,6 +64,14 @@ public class ProjectTagsController {
         return new Result<ProjectTagsDTO>().ok(data);
     }
 
+    /**
+     * @Description 保存项目与标签的关联并更新标签热度
+     * @param dto
+     * @param token
+     * @return com.epmet.commons.tools.utils.Result
+     * @author wangc
+     * @date 2021.03.20 02:34
+    */
     @PostMapping("save")
     public Result save(@RequestBody ProjectTagHookFormDTO dto, @LoginUser TokenDto token){
         dto.setCustomerId(token.getCustomerId());

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@@ -37,8 +37,12 @@ import com.epmet.commons.tools.utils.IpUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.*;
-import com.epmet.dao.ProjectOrgRelationDao;
+import com.epmet.constant.ProjectConstant;
+import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.SmsTemplateConstant;
+import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.ProjectDao;
+import com.epmet.dao.ProjectOrgRelationDao;
 import com.epmet.dao.ProjectProcessDao;
 import com.epmet.dao.ProjectStaffDao;
 import com.epmet.dto.CustomerStaffDTO;
@@ -51,6 +55,7 @@ import com.epmet.entity.ProjectEntity;
 import com.epmet.entity.ProjectOrgRelationEntity;
 import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.entity.ProjectStaffEntity;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserFeignClient;

epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml

@@ -28,6 +28,15 @@ spring:
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+      #监控页面
+      stat-view-servlet:
+        enabled: true
+        #loginUsername: admin
+        #loginPassword: admin
+        allow:
+      web-stat-filter:
+        enabled: true
+      filters: stat,wall,log4j2
   # 数据迁移工具flyway
   flyway:
     enabled: @spring.flyway.enabled@

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/GovVoiceApplication.java

@@ -8,7 +8,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
- *
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
@@ -18,7 +17,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @EnableAsync
 @ServletComponentScan
 public class GovVoiceApplication {
-	public static void main(String[] args) {
+    public static void main(String[] args) {
-		SpringApplication.run(GovVoiceApplication.class, args);
+        SpringApplication.run(GovVoiceApplication.class, args);
-	}
+    }
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/LbController.java

@@ -0,0 +1,23 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.commons.util.InetUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("lb")
+public class LbController {
+
+    @Autowired
+    private InetUtils inetUtils;
+
+    @PostMapping("get-host")
+    public Result getHost() {
+        String ipAddress = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+        return new Result().ok(ipAddress);
+    }
+
+}

epmet-module/oper-access/oper-access-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <version>0.3.18</version>
+    <version>0.3.19</version>
     <parent>
         <artifactId>oper-access</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java

@@ -13,7 +13,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.CustomerFunctionListFormDTO;
 import com.epmet.dto.result.CheckFloatFootBarResultDTO;
 import com.epmet.dto.result.DefaultFunctionListResultDTO;
-import com.epmet.feign.fallback.OperCustomizeOpenFeignClientFallback;
+import com.epmet.feign.fallback.OperCustomizeOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.49</version>
+    <version>0.3.70</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java

@@ -126,7 +126,7 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
      * 更新时间
      */
 	private Date updatedTime;
-	
+
 	private List<ResiGroupMemberDTO> memberList;
 
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -271,15 +271,6 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("/resi/group/topic/topiccreateduserbatch")
     Result<List<TopicCreatedUserBatchResultDTO>> topicCreatedUserBatch(@RequestParam("topicIds")List<String> topicIds);
 
-    /**
-     * @Description 通过话题id批量查询话题详情列表
-     * @return
-     * @author wxz
-     * @date 2021.05.18 16:24
-    */
-    @PostMapping("/resi/group/topic/get-topicdetail-byid/batch")
-    Result<List<ResiTopicDetailResultDTO>> listTopicDetailsByIds(TopicDetailBatchFormDTO input);
-
     /**
      * @Description  查询话题信息
      * @Param issueIds
@@ -289,6 +280,15 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("resi/group/topic/gettopicinfos")
     Result<List<TopicInfoResultDTO>> getTopicInfos(@RequestBody List<String> issueIds);
 
+
+    /**
+     * @Description 通过话题id批量查询话题详情列表
+     * @return
+     * @author wxz
+     * @date 2021.05.18 16:24
+    */
+    @PostMapping("/resi/group/topic/get-topicdetail-byid/batch")
+    Result<List<ResiTopicDetailResultDTO>> listTopicDetailsByIds(TopicDetailBatchFormDTO input);
     /**
      * @description 根据组id列表批量查询组信息列表
      *

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -3,13 +3,24 @@ package com.epmet.resi.group.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.group.dto.group.ResiGroupDTO;
 import com.epmet.resi.group.dto.group.form.*;
+import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
+import com.epmet.resi.group.dto.group.ResiGroupDTO;
+import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
+import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
+import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
+import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
+import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
 import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
 import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
+import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO;
+import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
+import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
+import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
+import com.epmet.resi.group.dto.topic.result.TopicBelongGroupResultDTO;
 import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
@@ -131,6 +142,7 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "sendEvent",param);
     }
 
+
     @Override
     public Result<ResiTopicDTO> queryTopicInfoByIssueId(String issueId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "queryTopicInfoByIssueId", issueId);
@@ -157,11 +169,6 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicAttachmentList", formDTO);
     }
 
-    @Override
-    public Result<List<AllMessagesResultDTO>> allMessages(AllMessagesFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "allMessages", formDTO);
-    }
-
     /**
      * 获取小组详情
      *
@@ -201,6 +208,11 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupPointDetail", formDTO);
     }
 
+    @Override
+    public Result<List<AllMessagesResultDTO>> allMessages(AllMessagesFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "allMessages", formDTO);
+    }
+
     @Override
     public Result<String> topicCreatedUser(String topicId) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicCreatedUser", topicId);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@@ -455,7 +455,6 @@ public class ResiGroupController {
         return new Result();
     }
 
-
     /**
      * @param formDTO
      * @author yinzuomei

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -47,6 +47,7 @@ import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.group.constant.GroupConstant;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetMessageFeignClient;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java

@@ -169,16 +169,16 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
 	 */
 	String selectUserRole(@Param("groupId")String groupId, @Param("userId")String userId);
 
-	int exitGroupById(@Param("id") String id, @Param("updatedBy") String updatedBy);
+    /**
-
+     * desc: 仅统计除组长之外的成员数
-	/**
+     *
-	 * desc: 仅统计除组长之外的成员数
+     * @param customerId
-	 *
+ 	 * @param groupId
-	 * @param customerId
+     * @return int
-	 * @param groupId
+     * @author LiuJanJun
-	 * @return int
+     * @date 2021/4/23 3:14 下午
-	 * @author LiuJanJun
+     */
-	 * @date 2021/4/23 3:14 下午
-	 */
 	int countAllMembers(@Param("customerId") String customerId, @Param("groupId") String groupId);
+
+	int exitGroupById(@Param("id") String id, @Param("updatedBy") String updatedBy);
 }