修改客户定制功能上下架、客户定制功能修改，接口开发

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

@@ -83,4 +83,8 @@ public class FunctionShoppingHistoryDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
+    /**
+     * 删除标识(0.未删除 1.已删除)
+     */
+    private Integer delFlag;
+}

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

@@ -0,0 +1,53 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 客户定制功能修改 入参
+ * 目前允许修改功能名称、大小图标
+ *
+ * @author zhangyong
+ * @since v1.0.0 2020-08-13
+ */
+@Data
+public class UpdateCustomerFunctionFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    public interface AddUserInternalGroup {}
+    public interface AddUserShowGroup extends CustomerClientShowGroup {}
+
+    /**
+     * 客户Id
+     */
+    @NotBlank(message = "客户ID不能为空", groups = {AddUserInternalGroup.class})
+    private String customerId;
+
+    /**
+     * 功能ID
+     */
+    @NotBlank(message = "功能ID不能为空", groups = {AddUserInternalGroup.class})
+    private String functionId;
+
+    /**
+     * 自定义功能名称
+     */
+    @NotBlank(message = "自定义功能名称不能为空", groups = {AddUserShowGroup.class})
+    private String functionName;
+
+    /**
+     * 自定义大图标
+     */
+    @NotBlank(message = "自定义大图标不能为空", groups = {AddUserShowGroup.class})
+    private String iconLargeImg;
+
+    /**
+     * 自定义小图标
+     */
+    @NotBlank(message = "自定义小图标不能为空", groups = {AddUserShowGroup.class})
+    private String iconSmallImg;
+
+    private String userId;
+}

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

@@ -0,0 +1,47 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 修改客户定制功能上下架 入参
+ *
+ * @author zhangyong
+ * @since v1.0.0 2020-08-13
+ */
+@Data
+public class UpdateShoppingStatusFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    public interface AddUserInternalGroup {}
+    public interface AddUserShowGroup extends CustomerClientShowGroup {}
+
+    /**
+     * 客户Id
+     */
+    @NotBlank(message = "客户Id不能为空", groups = {AddUserInternalGroup.class})
+    private String customerId;
+
+    /**
+     * 功能ID
+     */
+    @NotBlank(message = "功能ID不能为空", groups = {AddUserInternalGroup.class})
+    private String functionId;
+
+    /**
+     * 上架状态：0：下架、1：上架
+     */
+    @NotBlank(message = "上架状态：0：下架、1：上架不能为空", groups = {AddUserShowGroup.class})
+    private String shoppingStatus;
+
+    /**
+     * 理由
+     */
+    @NotBlank(message = "上下架理由不能为空", groups = {AddUserShowGroup.class})
+    private String reason;
+
+    private String userId;
+}

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

@@ -25,11 +25,12 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.CustomerFunctionDetailDTO;
-import com.epmet.dto.FunctionDTO;
 import com.epmet.dto.form.FunctionDetailFromDTO;
+import com.epmet.dto.form.UpdateCustomerFunctionFormDTO;
+import com.epmet.dto.form.UpdateShoppingStatusFormDTO;
 import com.epmet.dto.result.FunctionDetailResultDTO;
 import com.epmet.excel.CustomerFunctionDetailExcel;
 import com.epmet.service.CustomerFunctionDetailService;
@@ -50,7 +51,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("customerfunctiondetail")
 public class CustomerFunctionDetailController {
-    
+
     @Autowired
     private CustomerFunctionDetailService customerFunctionDetailService;
 
@@ -121,4 +122,37 @@ public class CustomerFunctionDetailController {
         return new Result<List<FunctionDetailResultDTO>>().ok(customerFunctionDetailService.resiAndWorkFunctionDetail(formDTO));
     }
 
-}
+    /**
+     * 修改客户定制功能上下架
+     * 修改上下架状态，保存上下架历史
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 09:17 2020-08-17
+     **/
+    @PostMapping("updateshoppingstatus")
+    public Result updateShoppingStatus(@LoginUser TokenDto tokenDto, @RequestBody UpdateShoppingStatusFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, UpdateShoppingStatusFormDTO.AddUserInternalGroup.class, UpdateShoppingStatusFormDTO.AddUserShowGroup.class);
+        formDTO.setUserId(tokenDto.getUserId());
+        return customerFunctionDetailService.updateShoppingStatus(formDTO);
+    }
+
+    /**
+     * 客户定制功能修改 入参
+     * 目前允许修改功能名称、大小图标
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 09:17 2020-08-17
+     **/
+    @PostMapping("updatecustomerfunction")
+    public Result updateCustomerFunction(@LoginUser TokenDto tokenDto, @RequestBody UpdateCustomerFunctionFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, UpdateCustomerFunctionFormDTO.AddUserInternalGroup.class, UpdateCustomerFunctionFormDTO.AddUserShowGroup.class);
+        formDTO.setUserId(tokenDto.getUserId());
+        return customerFunctionDetailService.updateCustomerFunction(formDTO);
+    }
+}

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

@@ -20,6 +20,8 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerFunctionDetailDTO;
 import com.epmet.dto.form.FunctionDetailFromDTO;
+import com.epmet.dto.form.UpdateCustomerFunctionFormDTO;
+import com.epmet.dto.form.UpdateShoppingStatusFormDTO;
 import com.epmet.dto.result.FunctionDetailResultDTO;
 import com.epmet.entity.CustomerFunctionDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -54,4 +56,24 @@ public interface CustomerFunctionDetailDao extends BaseDao<CustomerFunctionDetai
      * @Description  根据所属端和客户Id查询客户定制功能列表
      **/
     List<FunctionDetailResultDTO> selectFunctionDetailList(FunctionDetailFromDTO formDTO);
+
+    /**
+     * 修改客户定制功能上下架
+     * 修改上下架状态，保存上下架历史
+     *
+     * @param formDTO
+     * @Author zhangyong
+     * @Date 09:17 2020-08-17
+     **/
+    void updateShoppingStatus(UpdateShoppingStatusFormDTO formDTO);
+
+    /**
+     * 客户定制功能修改 入参
+     * 目前允许修改功能名称、大小图标
+     *
+     * @param formDTO
+     * @Author zhangyong
+     * @Date 10:00 2020-08-17
+     **/
+    void updateCustomerFunction(UpdateCustomerFunctionFormDTO formDTO);
 }

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

@@ -19,8 +19,11 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerFunctionDetailDTO;
 import com.epmet.dto.form.FunctionDetailFromDTO;
+import com.epmet.dto.form.UpdateCustomerFunctionFormDTO;
+import com.epmet.dto.form.UpdateShoppingStatusFormDTO;
 import com.epmet.dto.result.FunctionDetailResultDTO;
 import com.epmet.entity.CustomerFunctionDetailEntity;
 
@@ -102,4 +105,26 @@ public interface CustomerFunctionDetailService extends BaseService<CustomerFunct
      * @Description  根据所属端和客户Id查询客户定制功能列表
      **/
     List<FunctionDetailResultDTO> resiAndWorkFunctionDetail(FunctionDetailFromDTO formDTO);
-}
+
+    /**
+     * 修改客户定制功能上下架
+     * 修改上下架状态，保存上下架历史
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 09:17 2020-08-17
+     **/
+    Result updateShoppingStatus(UpdateShoppingStatusFormDTO formDTO);
+
+    /**
+     * 客户定制功能修改 入参
+     * 目前允许修改功能名称、大小图标
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author zhangyong
+     * @Date 10:00 2020-08-17
+     **/
+    Result updateCustomerFunction(UpdateCustomerFunctionFormDTO formDTO);
+}

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

@@ -23,13 +23,18 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerFunctionDetailDao;
 import com.epmet.dto.CustomerFunctionDetailDTO;
+import com.epmet.dto.FunctionShoppingHistoryDTO;
 import com.epmet.dto.form.FunctionDetailFromDTO;
+import com.epmet.dto.form.UpdateCustomerFunctionFormDTO;
+import com.epmet.dto.form.UpdateShoppingStatusFormDTO;
 import com.epmet.dto.result.FunctionDetailResultDTO;
 import com.epmet.entity.CustomerFunctionDetailEntity;
 import com.epmet.redis.CustomerFunctionDetailRedis;
 import com.epmet.service.CustomerFunctionDetailService;
+import com.epmet.service.FunctionShoppingHistoryService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -54,6 +59,9 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
     @Autowired
     private CustomerFunctionDetailRedis customerFunctionDetailRedis;
 
+    @Autowired
+    private FunctionShoppingHistoryService functionShoppingHistoryService;
+
     @Override
     public PageData<CustomerFunctionDetailDTO> page(Map<String, Object> params) {
         IPage<CustomerFunctionDetailEntity> page = baseDao.selectPage(
@@ -120,4 +128,22 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
         return list;
     }
 
-}
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result updateShoppingStatus(UpdateShoppingStatusFormDTO formDTO) {
+        // 修改 客户定制功能详情表，上下架状态
+        baseDao.updateShoppingStatus(formDTO);
+        // 保存日志记录到  客户定制功能上下架历史表
+        FunctionShoppingHistoryDTO historyDTO = ConvertUtils.sourceToTarget(formDTO, FunctionShoppingHistoryDTO.class);
+        historyDTO.setShoppingStatus(Integer.valueOf(formDTO.getShoppingStatus()));
+        functionShoppingHistoryService.save(historyDTO);
+        return new Result();
+    }
+
+    @Override
+    public Result updateCustomerFunction(UpdateCustomerFunctionFormDTO formDTO) {
+        baseDao.updateCustomerFunction(formDTO);
+        return new Result();
+    }
+
+}

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.5__add_del_flag.sql

@@ -0,0 +1 @@
+ALTER TABLE function_shopping_history ADD ( DEL_FLAG INT ( 11 ) NOT NULL COMMENT '删除标识(0.未删除 1.已删除)');

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

@@ -49,4 +49,35 @@
         cfd.display_order ASC
     </select>
 
+    <update id="updateShoppingStatus" parameterType="com.epmet.dto.form.UpdateShoppingStatusFormDTO">
+        UPDATE customer_function_detail
+        SET
+        SHOPPING_STATUS = #{shoppingStatus},
+        UPDATED_BY = #{userId},
+        UPDATED_TIME = now()
+        WHERE
+            DEL_FLAG = '0'
+            AND CUSTOMER_ID = #{customerId}
+            AND FUNCTION_ID = #{functionId}
+    </update>
+
+    <update id="updateCustomerFunction" parameterType="com.epmet.dto.form.UpdateCustomerFunctionFormDTO">
+        UPDATE customer_function_detail
+        SET
+        <if test="functionName != null and functionName.trim() != ''">
+            FUNCTION_NAME = #{functionName},
+        </if>
+        <if test="iconLargeImg != null and iconLargeImg.trim() != ''">
+            ICON_LARGE_IMG = #{iconLargeImg},
+        </if>
+        <if test="iconSmallImg != null and iconSmallImg.trim() != ''">
+            ICON_SMALL_IMG = #{iconSmallImg},
+        </if>
+        UPDATED_BY = #{userId},
+        UPDATED_TIME = now()
+        WHERE
+            DEL_FLAG = '0'
+            AND CUSTOMER_ID = #{customerId}
+            AND FUNCTION_ID = #{functionId}
+    </update>
 </mapper>