diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/HealthCheckController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/HealthCheckController.java new file mode 100644 index 0000000000..63241a4bac --- /dev/null +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/HealthCheckController.java @@ -0,0 +1,21 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("healthcheck") +public class HealthCheckController { + + /** + * http健康检查 + * @return + */ + @PostMapping("http") + public Result httpHealthCheck() { + return new Result(); + } + +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFootBarFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFootBarFormDTO.java index 716c34db78..01886698a8 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFootBarFormDTO.java +++ b/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.class}) + private String userId; /** * 排序索引号dto */ diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index 6803e7a609..561d4d7ce0 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -5,6 +5,11 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerFootBarDTO; import com.epmet.dto.form.CheckFloatFootBarFormDTO; import com.epmet.dto.form.CustomerFootBarFormDTO; +import com.epmet.feign.fallback.OperCustomizeOpenFeignClientFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; + +import com.epmet.commons.tools.constant.ServiceConstant; +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; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFootBarController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFootBarController.java index 9013c066fd..63d4cc6b4b 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFootBarController.java +++ b/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(); } @@ -256,9 +258,10 @@ public class CustomerFootBarController { * @return */ @PostMapping("deletefootbar") - public Result deleteFootBar(@RequestBody CustomerFootBarFormDTO form) { + public Result deleteFootBar(@LoginUser TokenDto tokenDto, @RequestBody CustomerFootBarFormDTO form) { + form.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(form, CustomerFootBarFormDTO.DeleteFootbarsGroup.class); - customerFootBarService.deleteFootBar(form.getId()); + customerFootBarService.deleteFootBar(form.getId(),form.getUserId()); return new Result(); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java index df8c12eec0..d68c74c750 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java @@ -64,7 +64,7 @@ public interface CustomerFootBarDao extends BaseDao { * @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 { List 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 listFootBarOwnerCustomerIds(); @@ -119,4 +119,6 @@ public interface CustomerFootBarDao extends BaseDao { @Param("iconPath")String iconPath, @Param("selectedIconPath")String selectedIconPath, @Param("floatIconPath")String floatIconPath); + + int updateFootBarDel(@Param("id") String id, @Param("userId")String userId); } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFootBarService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFootBarService.java index aa27acbf8b..0cb8bba353 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFootBarService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFootBarService.java @@ -110,15 +110,15 @@ public interface CustomerFootBarService extends BaseService orderList); + void saveOrder(String userId,List 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); - void deleteFootBar(String id); + void deleteFootBar(String id,String userId); /** * 校验当前客户是否可以选择浮起footbar模式 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java index 45d36b77b1..ddb7c959a5 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java @@ -134,7 +134,7 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl orderList) { + public void saveOrder(String userId,List 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 0 || uniqueCount2 > 0) { throw new RenException(EpmetErrorCode.OPER_CUSTOMER_FOOTBAR_EXISTS.getCode(), @@ -352,6 +353,7 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl syncList = baseDao.selectListByKey(Constant.DEFAULT_CUSTOMER, form.getAppType(), form.getSyncBarKeyList()); syncList.forEach(syncEntity -> { baseDao.updateCustomerFootBarByKey(form.getCustomerId(), @@ -366,6 +368,7 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl addList = baseDao.selectListByKey(Constant.DEFAULT_CUSTOMER, form.getAppType(), form.getAddBarKeyList()); addList.forEach(addEntity -> { @@ -374,6 +377,7 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl 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 customer_foot_bar - set DISPLAY=#{display} + set DISPLAY=#{display},UPDATED_BY=#{userId},UPDATED_TIME=NOW() where ID = #{id} + and DEL_FLAG='0' @@ -161,6 +163,7 @@ where CUSTOMER_ID = #{customerId} and APP_TYPE = #{appType} and BAR_KEY = #{barKey} + and DEL_FLAG='0'