完成商户管理、店铺管理、app管理、设备管理基本功能（v2.0）

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/CommercialController.java

@@ -45,8 +45,8 @@ public class CommercialController {
      */
     @DeleteMapping("/deleteCommercial")
     public R deleteCommercial(@NotEmpty String[] commercialIds){
-        commericalService.deleteCommercial(commercialIds);
-        return R.ok();
+        String s = commericalService.deleteCommercial(commercialIds);
+        return R.ok(s);
     }
 
     /**

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EquipmentController.java

@@ -87,9 +87,9 @@ public class EquipmentController {
      * @param equipmentVo
      * @return
      */
-    @GetMapping("/getEuipmentPlanList")
-    public R getEuipmentPlanList(@Validated(value = {QueryGroup.class}) EquipmentVo equipmentVo){
-        IPage<PlanItemBo> euipmentPlanList = equipmentService.getEuipmentPlanList(equipmentVo);
+    @GetMapping("/getEquipmentPlanList")
+    public R getEquipmentPlanList(@Validated(value = {QueryGroup.class}) EquipmentVo equipmentVo){
+        IPage<PlanItemBo> euipmentPlanList = equipmentService.getEquipmentPlanList(equipmentVo);
         return R.ok(euipmentPlanList);
     }
 
@@ -98,13 +98,17 @@ public class EquipmentController {
      * @param planItemVo
      * @return
      */
-    @PutMapping("/updateEuipmentPlan")
-    public R updateEuipmentPlan(@RequestBody @Validated(value = {EditGroup.class}) PlanItemVo planItemVo){
-        equipmentService.updateEuipmentPlan(planItemVo);
+    @PutMapping("/updateEquipmentPlan")
+    public R updateEquipmentPlan(@RequestBody @Validated(value = {EditGroup.class}) PlanItemVo planItemVo){
+        equipmentService.updateEquipmentPlan(planItemVo);
         return R.ok();
     }
 
-    //public R
+    @DeleteMapping("/deleteEquipmentPlan")
+    public R deleteEquipmentPlan(@NotEmpty String[] planItemIds){
+        equipmentService.deleteEquipmentPlan(planItemIds);
+        return R.ok();
+    }
 
 
     /**

ruoyi-demo/src/main/java/com/ruoyi/demo/service/CommericalService.java

@@ -10,7 +10,7 @@ import java.util.List;
 public interface CommericalService {
     void addCommercial(CommercialVo commercialVo);
 
-    void deleteCommercial(String[] commercialIds);
+    String deleteCommercial(String[] commercialIds);
 
     Commercial getCommercial(String commercialId);
 

ruoyi-demo/src/main/java/com/ruoyi/demo/service/EquipmentService.java

@@ -27,13 +27,15 @@ public interface EquipmentService {
 
     Page<Equipment> getEquipmentByStoreId(EquipmentVo equipmentVo);
 
-    IPage<PlanItemBo> getEuipmentPlanList(EquipmentVo equipmentVo);
+    IPage<PlanItemBo> getEquipmentPlanList(EquipmentVo equipmentVo);
 
-    void updateEuipmentPlan(PlanItemVo planItemVo);
+    void updateEquipmentPlan(PlanItemVo planItemVo);
 
     int getEquipmentCount();
 
     HashMap getEquipmentList(EquipmentVo equipmentVo);
 
     void deleteStoreEquipment(String[] equipmentIds);
+
+    void deleteEquipmentPlan(String[] planItemIds);
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/CommercialServiceImpl.java

@@ -44,8 +44,15 @@ public class CommercialServiceImpl implements CommericalService {
     }
 
     @Override
-    public void deleteCommercial(String[] commercialIds) {
+    public String deleteCommercial(String[] commercialIds) {
+        //1.判断旗下是否有小程序
+        QueryWrapper<App> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("commercial_id",commercialIds);
+        Long aLong = appMapper.selectCount(queryWrapper);
+        if (aLong != 0L)
+            return "待删除的商户中存在App";
         commercialMapper.deleteBatchIds(Arrays.asList(commercialIds));
+        return "删除成功";
     }
 
     @Override

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EquipmentServiceImpl.java

@@ -46,8 +46,6 @@ public class EquipmentServiceImpl implements EquipmentService {
         equipment.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipment.getAddrCode()));
         //2.新增创建时间
         equipment.setEnterTime(LocalDateTime.now());
-        //3.新增更新时间
-        equipment.setUpdateTime(equipment.getEnterTime());
         equipmentMapper.insert(equipment);
     }
 
@@ -129,7 +127,7 @@ public class EquipmentServiceImpl implements EquipmentService {
      * @return
      */
     @Override
-    public IPage<PlanItemBo> getEuipmentPlanList(EquipmentVo equipmentVo) {
+    public IPage<PlanItemBo> getEquipmentPlanList(EquipmentVo equipmentVo) {
         Page<PlanItemBo> page = new Page<>();
         page.setCurrent(equipmentVo.getPageNum());
         page.setSize(equipmentVo.getPageSize());
@@ -148,7 +146,7 @@ public class EquipmentServiceImpl implements EquipmentService {
     }
 
     @Override
-    public void updateEuipmentPlan(PlanItemVo planItemVo) {
+    public void updateEquipmentPlan(PlanItemVo planItemVo) {
         UpdateWrapper<PlanItem> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("item_id",planItemVo.getItemId());
         updateWrapper.set("sort",planItemVo.getSort());
@@ -229,5 +227,10 @@ public class EquipmentServiceImpl implements EquipmentService {
         equipmentMapper.update(null,updateWrapper);
     }
 
+    @Override
+    public void deleteEquipmentPlan(String[] planItemIds) {
+        planItemMapper.deleteBatchIds(Arrays.asList(planItemIds));
+    }
+
 
 }