Merge branch 'dev_plugins' into dev_temp

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/UpdateCustomizedFormDTO.java

@@ -36,8 +36,8 @@ public class UpdateCustomizedFormDTO implements Serializable {
     /**
      * 默认名称
      */
-    @NotBlank(message = "默认名称不能为空")
-    private String customizedName;
+    @NotBlank(message = "功能名称不能为空")
+    private String functionName;
 
     /**
      * 默认大图标

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerResultDTO.java

@@ -26,10 +26,46 @@ public class CustomerResultDTO implements Serializable {
 	 * 默认功能名称
 	 */
 	private String customizedName;
+	/**
+	 * 自定义功能名称
+	 */
+	private String functionName;
 	/**
 	 * 功能所属端(居民端:resi  工作端:work)
 	 */
 	private String fromApp;
+	/**
+	 * 默认大图标
+	 */
+	private String defaultLargeImg;
+	/**
+	 * 自定义大图标
+	 */
+	private String iconLargeImg;
+	/**
+	 * 默认小图标
+	 */
+	private String defaultSmallImg;
+	/**
+	 * 自定义小图标
+	 */
+	private String iconSmallImg;
+	/**
+	 * 上下架(0：下架、1：上架)
+	 */
+	private Integer shoppingStatus;
+	/**
+	 * 业务域名
+	 */
+	private String domainName;
+	/**
+	 * 外链地址
+	 */
+	private String targetLink;
+	/**
+	 * 排序
+	 */
+	private Integer displayOrder;
 	/**
 	 * 功能说明
 	 */

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionResultDTO.java

@@ -26,46 +26,10 @@ public class FunctionResultDTO implements Serializable {
 	 * 默认功能名称
 	 */
 	private String customizedName;
-	/**
-	 * 自定义功能名称
-	 */
-	private String functionName;
 	/**
 	 * 功能所属端(居民端:resi  工作端:work)
 	 */
 	private String fromApp;
-	/**
-	 * 默认大图标
-	 */
-	private String defaultLargeImg;
-	/**
-	 * 自定义大图标
-	 */
-	private String iconLargeImg;
-	/**
-	 * 默认小图标
-	 */
-	private String defaultSmallImg;
-	/**
-	 * 自定义小图标
-	 */
-	private String iconSmallImg;
-	/**
-	 * 上下架(0：下架、1：上架)
-	 */
-	private Integer shoppingStatus;
-	/**
-	 * 业务域名
-	 */
-	private String domainName;
-	/**
-	 * 外链地址
-	 */
-	private String targetLink;
-	/**
-	 * 排序
-	 */
-	private Integer displayOrder;
 	/**
 	 * 功能说明
 	 */

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java

@@ -183,10 +183,10 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
         //2.获取客户未有定制功能列表
         List<String> functionIds = customerList.stream().map(CustomerResultDTO::getFunctionId).collect(Collectors.toList());
         List<FunctionResultDTO> functionList = functionCustomizedDao.selectFunctionCustomizedList(functionIds);
-        resultDTO.setFunctionList(functionList);
         functionList.forEach(fl->{
             fl.setCustomerId(customerId);
         });
+        resultDTO.setFunctionList(functionList);
 
         return resultDTO;
     }
@@ -232,7 +232,7 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
         CustomerFunctionDetailEntity entity = new CustomerFunctionDetailEntity();
         entity.setCustomerId(formDTO.getCustomerId());
         entity.setFunctionId(formDTO.getFunctionId());
-        entity.setFunctionName(functionDTO.getFunctionId());
+        entity.setFunctionName(functionDTO.getCustomizedName());
         entity.setIconLargeImg(functionDTO.getIconLargeImg());
         entity.setIconSmallImg(functionDTO.getIconSmallImg());
         entity.setDomainName(functionDTO.getDomainName());

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java

@@ -196,12 +196,12 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
                                     || !formDTO.getFromApp().equals(customizedDTO.getFromApp()) ){
                                 // 4.1 如果修改的内容是其他字段，则返回语句
                                 tipCustomizedInfoUserId.append(customizedId.get(i).getId() + ",");
-                            } else if (!formDTO.getCustomizedName().equals(customizedDTO.getCustomizedName())
+                            } else if (!formDTO.getFunctionName().equals(customizedDTO.getCustomizedName())
                                         || !formDTO.getIconLargeImg().equals(customizedDTO.getIconLargeImg())
                                         || !formDTO.getIconSmallImg().equals(customizedDTO.getIconSmallImg())){
                                 // 4.2 如果修改的内容只是：功能名称和大小图标，, 需要批量更新客户数据
                                 CustomerFunctionDetailEntity customer = new CustomerFunctionDetailEntity();
-                                customer.setFunctionName(formDTO.getCustomizedName());
+                                customer.setFunctionName(formDTO.getFunctionName());
                                 customer.setIconLargeImg(formDTO.getIconLargeImg());
                                 customer.setIconSmallImg(formDTO.getIconSmallImg());
                                 customer.setId(customizedId.get(i).getId());
@@ -316,7 +316,7 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
     private void upFunction(UpdateCustomizedFormDTO formDTO, Integer flag){
         FunctionEntity entity = new FunctionEntity();
         entity.setId(formDTO.getFunctionId());
-        entity.setFunctionName(formDTO.getCustomizedName());
+        entity.setFunctionName(formDTO.getFunctionName());
         entity.setFunctionIcon(formDTO.getIconLargeImg());
         if (NumConstant.ONE == flag){
             entity.setShoppingStatus(Integer.valueOf(formDTO.getShoppingStatus()));
@@ -354,7 +354,7 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
         // 2.修改 定制功能表, 修改的字段范围，是：功能名称和大小图标
         FunctionCustomizedEntity entity = new FunctionCustomizedEntity();
         entity.setFunctionId(formDTO.getFunctionId());
-        entity.setCustomizedName(formDTO.getCustomizedName());
+        entity.setCustomizedName(formDTO.getFunctionName());
         entity.setIconLargeImg(formDTO.getIconLargeImg());
         entity.setIconSmallImg(formDTO.getIconSmallImg());
         baseDao.updateFunctionCustomized(entity);