Merge remote-tracking branch 'origin/dev_ui_upgrade' into develop

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

@@ -74,6 +74,8 @@ public class CustomerFootBarFormDTO {
     @NotNull(message = "显示状态不能为空", groups = { UpdateDisplayStatusGroup.class })
     private Boolean display;
 
+    @NotBlank(message = "操作人id不能为空", groups = { DeleteFootbarsGroup.class,SaveOrderGroup.class,UpdateDisplayStatusGroup })
+    private String userId;
     /**
      * 排序索引号dto
      */

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

@@ -220,9 +220,10 @@ public class CustomerFootBarController {
      * @return
      */
     @PostMapping("saveorder")
-    public Result saveOrder(@RequestBody CustomerFootBarFormDTO form) {
+    public Result saveOrder(@LoginUser TokenDto tokenDto, @RequestBody CustomerFootBarFormDTO form) {
+        form.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(form, CustomerFootBarFormDTO.SaveOrderGroup.class);
-        customerFootBarService.saveOrder(form.getOrderList());
+        customerFootBarService.saveOrder(form.getUserId(),form.getOrderList());
         return new Result();
     }
 
@@ -232,9 +233,10 @@ public class CustomerFootBarController {
      * @return
      */
     @PostMapping("updatedisplaystatus")
-    public Result updateDisplayStatus(@RequestBody CustomerFootBarFormDTO form) {
+    public Result updateDisplayStatus(@LoginUser TokenDto tokenDto,@RequestBody CustomerFootBarFormDTO form) {
+        form.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(form, CustomerFootBarFormDTO.UpdateDisplayStatusGroup.class);
-        customerFootBarService.updateDisplayStatus(form.getId(), form.getDisplay());
+        customerFootBarService.updateDisplayStatus(form.getId(), form.getDisplay(),form.getUserId());
         return new Result();
     }
 
@@ -257,8 +259,9 @@ public class CustomerFootBarController {
      */
     @PostMapping("deletefootbar")
     public Result deleteFootBar(@LoginUser TokenDto tokenDto, @RequestBody CustomerFootBarFormDTO form) {
+        form.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(form, CustomerFootBarFormDTO.DeleteFootbarsGroup.class);
-        customerFootBarService.deleteFootBar(form.getId(),tokenDto.getUserId());
+        customerFootBarService.deleteFootBar(form.getId(),form.getUserId());
         return new Result();
     }
 

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

@@ -64,7 +64,7 @@ public interface CustomerFootBarDao extends BaseDao<CustomerFootBarEntity> {
      * @param orderIndex
      * @return
      */
-    Integer updateOrder(@Param("id") String id, @Param("orderIndex") Integer orderIndex);
+    Integer updateOrder(@Param("id") String id, @Param("orderIndex") Integer orderIndex,@Param("userId") String userId);
 
     CustomerFootBarEntity getByAppTypeAndBarKeyOfCustomer(@Param("customerId") String customerId,
                                                           @Param("appType") String appType,
@@ -77,7 +77,7 @@ public interface CustomerFootBarDao extends BaseDao<CustomerFootBarEntity> {
     List<CustomerFootBarEntity> listByAppTypeAndCustomerId(@Param("customerId") String customerId,
                                                           @Param("appType") String appType);
 
-    void updateDisplayStatus(@Param("id") String id, @Param("display") Boolean display);
+    void updateDisplayStatus(@Param("id") String id, @Param("display") Boolean display,@Param("userId")String userId);
 
     List<String> listFootBarOwnerCustomerIds();
 

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

@@ -110,11 +110,11 @@ public interface CustomerFootBarService extends BaseService<CustomerFootBarEntit
 
     CustomerFootBarResultDTO getFootBarDetail(String id);
 
-    void saveOrder(List<CustomerFootBarFormDTO.OrderIndexDTO> orderList);
+    void saveOrder(String userId,List<CustomerFootBarFormDTO.OrderIndexDTO> orderList);
 
     CustomerFootBarEntity getByAppTypeAndBarKeyOfCustomer(String customerId, String appType, String barKey);
 
-    void updateDisplayStatus(String id, Boolean display);
+    void updateDisplayStatus(String id, Boolean display,String userId);
 
     void addDefault4Customer(String customerId, String appType);
 

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

@@ -212,9 +212,9 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
 
     @Transactional
     @Override
-    public void saveOrder(List<CustomerFootBarFormDTO.OrderIndexDTO> orderList) {
+    public void saveOrder(String userId,List<CustomerFootBarFormDTO.OrderIndexDTO> orderList) {
         for (CustomerFootBarFormDTO.OrderIndexDTO idx : orderList) {
-            baseDao.updateOrder(idx.getId(), idx.getOrderIndex());
+            baseDao.updateOrder(idx.getId(), idx.getOrderIndex(),userId);
         }
 
         if (!CollectionUtils.isEmpty(orderList)) {
@@ -237,8 +237,8 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
 
     @Transactional
     @Override
-    public void updateDisplayStatus(String id, Boolean display) {
+    public void updateDisplayStatus(String id, Boolean display,String userId) {
-        baseDao.updateDisplayStatus(id, display);
+        baseDao.updateDisplayStatus(id, display,userId);
 
         CustomerFootBarEntity footBarEntity = baseDao.selectById(id);
 
@@ -381,10 +381,6 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
                 entity.setCustomerId(form.getCustomerId());
                 entity.setOrderIndex(baseDao.fetchNextOrder(form.getCustomerId(), form.getAppType()));
                 entity.setDisplay(true);
-                entity.setCreatedBy(form.getUserId());
-                entity.setUpdatedBy(form.getUserId());
-                entity.setCreatedTime(new Date());
-                entity.setUpdatedTime(new Date());
                 baseDao.insert(entity);
             });
         }

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

@@ -24,14 +24,14 @@
     <!--更新顺序号-->
     <update id="updateOrder">
         update customer_foot_bar
-        set ORDER_INDEX = #{orderIndex}
+        set ORDER_INDEX = #{orderIndex},UPDATED_BY=#{userId},UPDATED_TIME=NOW()
         where ID = #{id}
         and DEL_FLAG='0'
     </update>
 
     <update id="updateDisplayStatus">
         update customer_foot_bar
-        set DISPLAY=#{display}
+        set DISPLAY=#{display},UPDATED_BY=#{userId},UPDATED_TIME=NOW()
         where ID = #{id}
         and DEL_FLAG='0'
     </update>