修改设备查询计划的问题

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

@@ -32,8 +32,8 @@ public class AppController {
      */
     @PostMapping("/addApp")
     public R addApp(@RequestBody @Validated(value={AddGroup.class}) AppVo appVo){
-        appService.addApp(appVo);
-        return R.ok();
+        R r = appService.addApp(appVo);
+        return r;
     }
 
     /**
@@ -71,8 +71,8 @@ public class AppController {
      */
     @PutMapping("/updateApp")
     public R updateApp(@RequestBody @Validated(value={EditGroup.class})AppVo appVo){
-        appService.updateApp(appVo);
-        return R.ok();
+        R r = appService.updateApp(appVo);
+        return r;
     }
 
     @GetMapping("/testCallBack")

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

@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.util.HashMap;
 
 @RestController
@@ -47,7 +49,7 @@ public class StoreController {
      * @return
      */
     @DeleteMapping("/deleteStore")
-    public R deleteStore(String[] storeIds){
+    public R deleteStore(@NotEmpty(message = "店铺Id不能为空") String[] storeIds){
         storeService.deleteStore(storeIds);
         return R.ok();
     }
@@ -64,7 +66,7 @@ public class StoreController {
     }
 
     @GetMapping("/getStore")
-    public R getStore(String storeId){
+    public R getStore(@NotBlank(message = "店铺Id不能为空") String storeId){
         Store store = storeService.getStore(storeId);
         return R.ok(store);
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/App.java

@@ -31,18 +31,18 @@ public class App {
     private String callBack;
     @TableField("appSecret")
     private String appSecret;
-    @TableField("prove_1")
-    private String prove1;
-    @TableField("prove_2")
-    private String prove2;
-    @TableField("prove_3")
-    private String prove3;
-    @TableField("prove_4")
-    private String prove4;
-    @TableField("prove_5")
-    private String prove5;
+//    @TableField("prove_1")
+//    private String prove1;
+//    @TableField("prove_2")
+//    private String prove2;
+//    @TableField("prove_3")
+//    private String prove3;
+//    @TableField("prove_4")
+//    private String prove4;
+//    @TableField("prove_5")
+//    private String prove5;
     @TableField("create_time")
-    private LocalDateTime create_time;
+    private LocalDateTime createTime;
     @TableField("annotation")
     private String annotation;
     @TableField("deleted")
@@ -56,11 +56,11 @@ public class App {
         this.commercialName = appVo.getCommercialName();
         this.state = appVo.getState();
         this.callBack = appVo.getCallBack();
-        this.prove1 = appVo.getProve1();
-        this.prove2 = appVo.getProve2();
-        this.prove3 = appVo.getProve3();
-        this.prove4 = appVo.getProve4();
-        this.prove5 = appVo.getProve5();
+//        this.prove1 = appVo.getProve1();
+//        this.prove2 = appVo.getProve2();
+//        this.prove3 = appVo.getProve3();
+//        this.prove4 = appVo.getProve4();
+//        this.prove5 = appVo.getProve5();
         this.annotation = appVo.getAnnotation();
     }
 }

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

@@ -2,6 +2,7 @@ package com.ruoyi.demo.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.demo.entity.App;
 import com.ruoyi.demo.entity.Commercial;
 import com.ruoyi.demo.entity.vo.AppVo;
@@ -9,7 +10,7 @@ import com.ruoyi.demo.entity.vo.AppVo;
 import java.util.List;
 
 public interface AppService {
-    void addApp(AppVo appVo);
+    R addApp(AppVo appVo);
 
     void deleteApp(String[] appKeys);
 
@@ -17,7 +18,7 @@ public interface AppService {
 
     App getApp(AppVo appVo);
 
-    void updateApp(AppVo appVo);
+    R updateApp(AppVo appVo);
 
     void testCallBack(String callBack);
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.demo.entity.App;
 import com.ruoyi.demo.entity.Commercial;
@@ -36,15 +37,24 @@ public class AppServiceImpl implements AppService {
     CommercialMapper commercialMapper;
 
     @Override
-    public void addApp(AppVo appVo) {
-        App app = new App(appVo);
-        //生成appkey
-        app.setAppkey(UuidUtil.getUUID());
-        //生成密钥
-        app.setAppSecret(UuidUtil.getUUID());
-        //时间
-        app.setCreate_time(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
-        appMapper.insert(app);
+    public R addApp(AppVo appVo) {
+        //判断是否存在该商户
+        QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("commercial_id",appVo.getCommercialId());
+        Long aLong = commercialMapper.selectCount(queryWrapper);
+        if (aLong > 0){
+            App app = new App(appVo);
+            //生成appkey
+            app.setAppkey(UuidUtil.getUUID());
+            //生成密钥
+            app.setAppSecret(UuidUtil.getUUID());
+            //时间
+            app.setCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            appMapper.insert(app);
+            return R.ok("添加成功");
+        }
+        return R.fail("不存在该商户");
+
     }
 
     @Override
@@ -74,23 +84,31 @@ public class AppServiceImpl implements AppService {
     }
 
     @Override
-    public void updateApp(AppVo appVo) {
-        UpdateWrapper<App> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("appkey",appVo.getAppkey())
-            .set("app_logo",appVo.getAppLogo())
-            .set("app_name",appVo.getAppName())
-            .set("app_introduce",appVo.getAppIntroduce())
-            .set("commercial_id",appVo.getCommercialId())
-            .set("commercial_name",appVo.getCommercialName())
-            .set("state",appVo.getState())
-            .set("call_back",appVo.getCallBack())
-            .set("prove_1",appVo.getProve1())
-            .set("prove_2",appVo.getProve2())
-            .set("prove_3",appVo.getProve3())
-            .set("prove_4",appVo.getProve4())
-            .set("prove_5",appVo.getProve5())
-            .set("annotation",appVo.getAnnotation());
-        appMapper.update(null,updateWrapper);
+    public R updateApp(AppVo appVo) {
+        //判断是否存在该商户
+        QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("commercial_id",appVo.getCommercialId());
+        Long aLong = commercialMapper.selectCount(queryWrapper);
+        if (aLong > 0){
+            UpdateWrapper<App> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("appkey",appVo.getAppkey())
+                .set("app_logo",appVo.getAppLogo())
+                .set("app_name",appVo.getAppName())
+                .set("app_introduce",appVo.getAppIntroduce())
+                .set("commercial_id",appVo.getCommercialId())
+                .set("commercial_name",appVo.getCommercialName())
+                .set("state",appVo.getState())
+                .set("call_back",appVo.getCallBack())
+                .set("prove_1",appVo.getProve1())
+                .set("prove_2",appVo.getProve2())
+                .set("prove_3",appVo.getProve3())
+                .set("prove_4",appVo.getProve4())
+                .set("prove_5",appVo.getProve5())
+                .set("annotation",appVo.getAnnotation());
+            appMapper.update(null,updateWrapper);
+            return R.ok("修改成功");
+        }else
+            return R.fail("不存在该商户");
     }
 
     @Override

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

@@ -103,7 +103,6 @@ public class CommercialServiceImpl implements CommericalService {
                 commercialBo.setApps(list);
             }
         }
-
         commercialPage.setRecords(null);
         HashMap<String, Object> objectObjectHashMap = new HashMap<>();
         objectObjectHashMap.put("page",commercialPage);

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

@@ -236,9 +236,17 @@ public class EquipmentServiceImpl implements EquipmentService {
         queryWrapper.and(planItemBoQueryWrapper -> {
             planItemBoQueryWrapper.eq("dl_plan_item.deleted",0);
         });
+        queryWrapper.and(planItemBoQueryWrapper -> {
+            planItemBoQueryWrapper.eq("dl_plan.state",1);
+        });
+        queryWrapper.and(planItemBoQueryWrapper -> {
+            planItemBoQueryWrapper.eq("dl_plan.on_state",0);
+        });
         queryWrapper.and(planItemBoQueryWrapper -> {
             planItemBoQueryWrapper.gt("plan_end_time",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
         });
+
+        queryWrapper.apply("dl_plan.`plan_id` = dl_plan_item.`plan_id`");
         if (equipmentVo.getSearchText() != null && !equipmentVo.getSearchText().equals("")){
             queryWrapper.and(planItemBoQueryWrapper -> {
                 planItemBoQueryWrapper.likeRight("plan_id",equipmentVo.getSearchText()).or()
@@ -247,6 +255,7 @@ public class EquipmentServiceImpl implements EquipmentService {
         }
         queryWrapper.orderByDesc("sort");
         IPage<PlanItemBo> euipmentPlanList = planItemMapper.getEuipmentPlanList(page, queryWrapper);
+
         return euipmentPlanList;
     }
 

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

@@ -94,22 +94,27 @@ public class StoreServiceImpl implements StoreService {
         List<String> collect = pageInfo.getRecords().stream().map(item -> {
             return item.getStoreId();
         }).collect(Collectors.toList());
-        QueryWrapper<Equipment> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.select("store_id","count(*) as state");
-        queryWrapper1.in("store_id",collect);
-        queryWrapper1.groupBy("store_id");
-        List<Equipment> equipments = equipmentMapper.selectList(queryWrapper1);
 
+        HashMap<String, Object> objectObjectHashMap = new HashMap<>();
         List<StoreBo> storeBos = new ArrayList<>();
-        //组装
-        for (Store store : pageInfo.getRecords()) {
-            StoreBo storeBo = new StoreBo(store);
-            storeBo.setCount(findEquipmentCount(store.getStoreId(),equipments));
-            storeBos.add(storeBo);
+        if (!collect.isEmpty()){
+            QueryWrapper<Equipment> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.select("store_id","count(*) as state");
+            queryWrapper1.in("store_id",collect);
+            queryWrapper1.groupBy("store_id");
+            List<Equipment> equipments = equipmentMapper.selectList(queryWrapper1);
+
+            //组装
+            for (Store store : pageInfo.getRecords()) {
+                StoreBo storeBo = new StoreBo(store);
+                storeBo.setCount(findEquipmentCount(store.getStoreId(),equipments));
+                storeBos.add(storeBo);
+            }
+
+            pageInfo.setRecords(null);
+            objectObjectHashMap.put("page",pageInfo);
+            objectObjectHashMap.put("data",storeBos);
         }
-
-        pageInfo.setRecords(null);
-        HashMap<String, Object> objectObjectHashMap = new HashMap<>();
         objectObjectHashMap.put("page",pageInfo);
         objectObjectHashMap.put("data",storeBos);
         return objectObjectHashMap;