Merge branch 'dev_plugins' into dev_temp

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

@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 运营端-定制功能采集-接口返参
+ * @Author sun
+ */
+@Data
+public class CustomerFunctionCollectResultDTO implements Serializable {
+	private static final long serialVersionUID = 2971689193155710437L;
+
+	/**
+	 * 客户某一端定制功能总数
+	 */
+	private Integer num;
+
+	/**
+	 * 所属端中文名称
+	 */
+	private String fromAppName;
+
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionDetailController.java

@@ -188,8 +188,7 @@ public class CustomerFunctionDetailController {
     @PostMapping("customerfunctioncollect")
     public Result customerFunctionCollect(@LoginUser TokenDto tokenDto, @RequestBody CustomerFunctionCollectFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, CustomerFunctionCollectFormDTO.AddUserInternalGroup.class, CustomerFunctionCollectFormDTO.AddUserShowGroup.class);
-        customerFunctionDetailService.customerFunctionCollect(formDTO);
+        return customerFunctionDetailService.customerFunctionCollect(formDTO);
-        return new Result();
     }
 
 

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionDetailDao.java

@@ -19,9 +19,11 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerFunctionDetailDTO;
+import com.epmet.dto.form.CustomerFunctionCollectFormDTO;
 import com.epmet.dto.form.FunctionDetailFromDTO;
 import com.epmet.dto.form.UpdateCustomerFunctionFormDTO;
 import com.epmet.dto.form.UpdateShoppingStatusFormDTO;
+import com.epmet.dto.result.CustomerFunctionCollectResultDTO;
 import com.epmet.dto.result.CustomerResultDTO;
 import com.epmet.dto.result.FunctionDetailResultDTO;
 import com.epmet.entity.CustomerFunctionDetailEntity;
@@ -101,4 +103,12 @@ public interface CustomerFunctionDetailDao extends BaseDao<CustomerFunctionDetai
      * @Description  .查询客户当前已有定制功能最大排序号
      **/
     CustomerFunctionDetailDTO selectOrderByCustomerId(@Param("customerId") String customerId);
+
+    /**
+     * @param  formDTO
+     * @return
+     * @Author sun
+     * @Description  查询当前采集功能所属端，统计客户在当前所属端已上架功能总数
+     **/
+    CustomerFunctionCollectResultDTO sumCustomerFunctionNum(CustomerFunctionDetailDTO formDTO);
 }

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

@@ -150,5 +150,5 @@ public interface CustomerFunctionDetailService extends BaseService<CustomerFunct
      * @Author sun
      * @Description  定制功能采集
      **/
-    void customerFunctionCollect(CustomerFunctionCollectFormDTO formDTO);
+    Result customerFunctionCollect(CustomerFunctionCollectFormDTO formDTO);
 }

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

@@ -36,10 +36,7 @@ import com.epmet.dto.CustomerFunctionDetailDTO;
 import com.epmet.dto.FunctionCustomizedDTO;
 import com.epmet.dto.FunctionShoppingHistoryDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.CustomerFunctionCustomizedListResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.CustomerResultDTO;
-import com.epmet.dto.result.FunctionDetailResultDTO;
-import com.epmet.dto.result.FunctionResultDTO;
 import com.epmet.entity.CustomerFunctionDetailEntity;
 import com.epmet.entity.CustomerFunctionEntity;
 import com.epmet.entity.FunctionShoppingHistoryEntity;
@@ -156,6 +153,19 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result updateShoppingStatus(UpdateShoppingStatusFormDTO formDTO) {
+        // 用户定制功能上架，需判断，已上架的数量是否超过12
+        if (NumConstant.ONE_STR.equals(formDTO.getShoppingStatus())){
+            // 根据functionId，customerId、所属端，查询当前客户 现已上架的 功能数量。
+            CustomerFunctionDetailDTO functionDetailDTO = new CustomerFunctionDetailDTO();
+            functionDetailDTO.setFunctionId(formDTO.getFunctionId());
+            functionDetailDTO.setCustomerId(formDTO.getCustomerId());
+            CustomerFunctionCollectResultDTO functionNum = baseDao.sumCustomerFunctionNum(functionDetailDTO);
+            if (null != functionNum){
+                if (NumConstant.TWELVE <= functionNum.getNum()){
+                    return new Result().error(8000,"当前客户"+ functionNum.getFromAppName() +"已上架12个定制功能。不能继续上架！");
+                }
+            }
+        }
         // 修改 客户定制功能详情表，上下架状态
         baseDao.updateShoppingStatus(formDTO);
         // 保存日志记录到  客户定制功能上下架历史表
@@ -219,7 +229,14 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
      **/
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void customerFunctionCollect(CustomerFunctionCollectFormDTO formDTO) {
+    public Result customerFunctionCollect(CustomerFunctionCollectFormDTO formDTO) {
+        //0.查询当前采集功能所属端，统计客户在当前所属端已上架功能总数
+        CustomerFunctionDetailDTO customerFunctionDetailDTO = ConvertUtils.sourceToTarget(formDTO,CustomerFunctionDetailDTO.class);
+        CustomerFunctionCollectResultDTO dto = baseDao.sumCustomerFunctionNum(customerFunctionDetailDTO);
+        if (dto.getNum() >= NumConstant.TWELVE) {
+            return new Result().error(8000, String.format("当前客户在[%s]已存在12个上线功能,不允许再次采集！", dto.getFromAppName()));
+        }
+
         //1.查询定制功能详细信息
         FunctionCustomizedDTO functionDTO = functionCustomizedDao.selectByFunctionId(formDTO.getFunctionId());
         if(functionDTO == null){
@@ -259,6 +276,7 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
         historyEntity.setReason(formDTO.getReason());
         functionShoppingHistoryDao.insert(historyEntity);
 
+        return new Result();
     }
 
 }

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

@@ -359,6 +359,7 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
         this.upFunction(formDTO, NumConstant.ONE);
         // 2.修改 定制功能表, 修改的字段范围，是所有入参字段
         FunctionCustomizedEntity entity = ConvertUtils.sourceToTarget(formDTO, FunctionCustomizedEntity.class);
+        entity.setCustomizedName(formDTO.getFunctionName());
         baseDao.updateFunctionCustomized(entity);
     }
 

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml

@@ -97,6 +97,30 @@
         LIMIT 1
     </select>
 
+    <!-- 统计客户某一端上架定制功能数 -->
+    <select id="sumCustomerFunctionNum" resultType="com.epmet.dto.result.CustomerFunctionCollectResultDTO">
+        SELECT
+            COUNT(cfd.FUNCTION_ID) AS "num",
+            IF(fc.FROM_APP='gov','工作端',IF(fc.FROM_APP='resi','居民端','无')) AS "fromAppName"
+        FROM
+            customer_function_detail cfd
+        INNER JOIN function_customized fc ON cfd.FUNCTION_ID = fc.FUNCTION_ID
+        WHERE
+            cfd.DEL_FLAG = '0'
+        AND fc.DEL_FLAG = '0'
+        AND cfd.SHOPPING_STATUS = '1'
+        AND cfd.CUSTOMER_ID = #{customerId}
+        AND fc.FROM_APP = (
+            SELECT
+                FROM_APP
+            FROM
+                function_customized
+            WHERE
+                DEL_FLAG = '0'
+            AND FUNCTION_ID = #{functionId}
+        )
+    </select>
+
     <update id="updateShoppingStatus" parameterType="com.epmet.dto.form.UpdateShoppingStatusFormDTO">
         UPDATE customer_function_detail
         SET