修改商户、app、设备修改

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

@@ -54,8 +54,8 @@ public class EquipmentController {
      */
     @PutMapping("/updateEquipment")
     public R updateEquipment(@RequestBody @Validated(value = {AddGroup.class})EquipmentVo equipmentVo){
-        equipmentService.updateEquipment(equipmentVo);
-        return R.ok();
+        R r = equipmentService.updateEquipment(equipmentVo);
+        return r;
     }
 
     /**

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

@@ -22,6 +22,8 @@ public class Commercial {
     private String code;
     @TableField("commercial_type")
     private String commercialType;
+    @TableField("state")
+    private int state;
     @TableField("principal_name")
     private String principalName;
     @TableField("principal_telephone")
@@ -51,6 +53,7 @@ public class Commercial {
         this.commercialName = commercialVo.getCommercialName();
         this.code = commercialVo.getCode();
         this.commercialType = commercialVo.getCommercialType();
+        this.state = commercialVo.getState();
         this.principalName = commercialVo.getPrincipalName();
         this.principalTelephone = commercialVo.getPrincipalTelephone();
         this.prove1 = commercialVo.getProve1();

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/CommercialVo.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 @Data
@@ -19,6 +20,8 @@ public class CommercialVo {
     private String code;
 
     private String commercialType;
+    @NotNull(groups = {AddGroup.class, EditGroup.class},message = "状态不能为空")
+    private Integer state;
     @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "负责人名称不能为空")
     private String principalName;
     @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "负责人联系方式不能为空")

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

@@ -1,6 +1,7 @@
 package com.ruoyi.demo.service;
 
 import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.demo.entity.Commercial;
 import com.ruoyi.demo.entity.vo.CommercialVo;
 
@@ -18,5 +19,5 @@ public interface CommericalService {
 
     List<Commercial>  getCommercialName();
 
-    void updateCommercial(CommercialVo commercialVo);
+    R updateCommercial(CommercialVo commercialVo);
 }

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

@@ -3,6 +3,7 @@ package com.ruoyi.demo.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.Equipment;
 import com.ruoyi.demo.entity.PlanItem;
 import com.ruoyi.demo.entity.bo.EquipmentBo;
@@ -16,7 +17,7 @@ import java.util.List;
 public interface EquipmentService {
     Integer addEquipment(EquipmentVo equipmentVo);
 
-    void updateEquipment(EquipmentVo equipmentVo);
+    R updateEquipment(EquipmentVo equipmentVo);
 
     EquipmentBo getEquipment(String equipmentId);
 

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

@@ -7,14 +7,10 @@ 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;
-import com.ruoyi.demo.entity.Plan;
+import com.ruoyi.demo.entity.*;
 import com.ruoyi.demo.entity.bo.CallBackBean;
 import com.ruoyi.demo.entity.vo.AppVo;
-import com.ruoyi.demo.mapper.AppMapper;
-import com.ruoyi.demo.mapper.CommercialMapper;
-import com.ruoyi.demo.mapper.PlanMapper;
+import com.ruoyi.demo.mapper.*;
 import com.ruoyi.demo.service.AppService;
 import com.ruoyi.demo.utils.SendCallBackUtil;
 import com.ruoyi.demo.utils.UuidUtil;
@@ -41,6 +37,12 @@ public class AppServiceImpl implements AppService {
     @Autowired
     PlanMapper planMapper;
 
+    @Autowired
+    GoodsMapper goodsMapper;
+
+    @Autowired
+    OrderMapper orderMapper;
+
     @Override
     public R addApp(AppVo appVo) {
         //判断是否存在该商户
@@ -71,7 +73,7 @@ public class AppServiceImpl implements AppService {
     public PageInfo<App> getAppListByCommercialId(AppVo appVo) {
         QueryWrapper<App> queryWrapper = new QueryWrapper<>();
         if (appVo.getSearchText() != null && !appVo.getSearchText().equals("")){
-            queryWrapper.likeRight("app_key",appVo.getSearchText());
+            queryWrapper.likeRight("appkey",appVo.getSearchText());
             queryWrapper.or().like("app_name",appVo.getSearchText());
             queryWrapper.or().likeRight("commercial_name",appVo.getSearchText());
         }
@@ -91,10 +93,23 @@ public class AppServiceImpl implements AppService {
     @Override
     public R updateApp(AppVo appVo) {
         //判断是否存在该商户
-        QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("commercial_id",appVo.getCommercialId());
-        Long aLong = commercialMapper.selectCount(queryWrapper);
-        if (aLong > 0){
+        QueryWrapper<App> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("app_name","state");
+        queryWrapper.eq("appkey",appVo.getAppkey());
+        App app = appMapper.selectOne(queryWrapper);
+        if (app != null){
+            //1.判断是否关闭小程序权限
+            if((appVo.getState() != app.getState()) && appVo.getState() == 1 ){
+                //禁用,并下架所有的广告
+                UpdateWrapper<Plan> planUpdateWrapper = new UpdateWrapper<>();
+                planUpdateWrapper.eq("appkey",appVo.getAppkey());
+                planUpdateWrapper.set("on_state",1);
+                if (!appVo.equals(app.getAppName()))
+                    planUpdateWrapper.set("app_name",app.getAppName());
+                planMapper.update(null,planUpdateWrapper);
+            }
+
+            //2.修改信息
             UpdateWrapper<App> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("appkey",appVo.getAppkey())
                 .set("app_logo",appVo.getAppLogo())
@@ -112,17 +127,22 @@ public class AppServiceImpl implements AppService {
                 .set("annotation",appVo.getAnnotation());
             appMapper.update(null,updateWrapper);
 
-
-            if(appVo.getState() == 1){
-                //禁用
-                UpdateWrapper<Plan> planUpdateWrapper = new UpdateWrapper<>();
-                planUpdateWrapper.eq("appkey",appVo.getAppkey());
-                planUpdateWrapper.set("on_state",1);
-                planMapper.update(null,planUpdateWrapper);
+            //3.修改冗余信息
+            if (!appVo.equals(app.getAppName())){
+                UpdateWrapper<Goods> updateWrapper1 = new UpdateWrapper<>();
+                updateWrapper1.eq("appkey",appVo.getAppkey());
+                updateWrapper1.set("app_name",appVo.getAppName());
+                goodsMapper.update(null,updateWrapper1);
+
+                UpdateWrapper<Order> updateWrapper3 = new UpdateWrapper<>();
+                updateWrapper3.eq("appkey",appVo.getAppkey());
+                updateWrapper3.set("app_name",appVo.getAppName());
+                orderMapper.update(null,updateWrapper3);
             }
+
             return R.ok("修改成功");
         }else
-            return R.fail("不存在该商户");
+            return R.fail("不存在该小程序");
     }
 
     @Override
@@ -134,7 +154,7 @@ public class AppServiceImpl implements AppService {
     public Page<App> getAppList(AppVo appVo) {
         QueryWrapper<App> queryWrapper = new QueryWrapper<>();
         if (appVo.getSearchText() != null && !appVo.getSearchText().equals("")){
-            queryWrapper.likeRight("app_key",appVo.getSearchText());
+            queryWrapper.likeRight("appkey",appVo.getSearchText());
             queryWrapper.or().like("app_name",appVo.getSearchText());
             queryWrapper.or().likeRight("commercial_name",appVo.getSearchText());
         }

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

@@ -4,14 +4,17 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.demo.entity.App;
 import com.ruoyi.demo.entity.Commercial;
+import com.ruoyi.demo.entity.Plan;
 import com.ruoyi.demo.entity.bo.CommercialBo;
 import com.ruoyi.demo.entity.vo.CommercialVo;
 import com.ruoyi.demo.mapper.AppMapper;
 import com.ruoyi.demo.mapper.CommercialMapper;
+import com.ruoyi.demo.mapper.PlanMapper;
 import com.ruoyi.demo.service.CommericalService;
 import com.ruoyi.demo.utils.InitMapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +41,9 @@ public class CommercialServiceImpl implements CommericalService {
 
     @Autowired
     AppMapper appMapper;
+
+    @Autowired
+    PlanMapper planMapper;
     @Override
     public void addCommercial(CommercialVo commercialVo) {
         Commercial commercial = new Commercial(commercialVo);
@@ -119,28 +125,67 @@ public class CommercialServiceImpl implements CommericalService {
     }
 
     @Override
-    public void updateCommercial(CommercialVo commercialVo) {
-        //1.修改商户
-        UpdateWrapper<Commercial> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("commercial_id",commercialVo.getCommercialId())
+    public R updateCommercial(CommercialVo commercialVo) {
+        QueryWrapper<Commercial> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("state","commercial_name");
+        queryWrapper.eq("commercial_id",commercialVo.getCommercialId());
+        Commercial commercial = commercialMapper.selectOne(queryWrapper);
+        if (commercial != null){
+            //1.判断是否修改商户状态
+            if (commercialVo.getState() != commercial.getState()){
+                if (commercialVo.getState() == 1){
+                    //1.修改app状态 ——> 关闭
+                    UpdateWrapper<App> updateWrapper1 = new UpdateWrapper<>();
+                    updateWrapper1.eq("commercial_id",commercialVo.getCommercialId());
+                    updateWrapper1.set("state",1);
+                    appMapper.update(null,updateWrapper1);
+
+                    //2.下架所有广告
+                    UpdateWrapper<Plan> updateWrapper2 = new UpdateWrapper<>();
+                    updateWrapper2.eq("commercial_id",commercialVo.getCommercialId());
+                    updateWrapper2.set("on_state",1);
+                    planMapper.update(null,updateWrapper2);
+                }else {
+                    //1.修改app状态 ——> 启动
+                    UpdateWrapper<App> updateWrapper1 = new UpdateWrapper<>();
+                    updateWrapper1.eq("commercial_id",commercialVo.getCommercialId());
+                    updateWrapper1.set("state",0);
+                    appMapper.update(null,updateWrapper1);
+                }
+            }
+
+            //2.修改商户
+            UpdateWrapper<Commercial> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("commercial_id",commercialVo.getCommercialId())
                 .set("commercial_name",commercialVo.getCommercialName())
                 .set("code",commercialVo.getCode())
                 .set("principal_name",commercialVo.getPrincipalName())
                 .set("principal_telephone",commercialVo.getPrincipalTelephone())
-                    .set("prove_1",commercialVo.getProve1())
-            .set("prove_2",commercialVo.getProve2())
-            .set("prove_3",commercialVo.getProve3())
-            .set("prove_4",commercialVo.getProve4())
-            .set("prove_5",commercialVo.getProve5())
-            .set("addr_code",commercialVo.getAddrCode())
-            .set("addr_code_info",initMapUtil.getInitAddrCodeMap(commercialVo.getAddrCode()))
-            .set("addr_info",commercialVo.getAddrInfo());
-        commercialMapper.update(null,updateWrapper);
-
-        //2.修改app中的商户名字
-        UpdateWrapper<App> updateWrapper1 = new UpdateWrapper<>();
-        updateWrapper1.eq("commercial_id",commercialVo.getCommercialId())
-            .set("commercial_name",commercialVo.getCommercialName());
-        appMapper.update(null,updateWrapper1);
+                .set("prove_1",commercialVo.getProve1())
+                .set("prove_2",commercialVo.getProve2())
+                .set("prove_3",commercialVo.getProve3())
+                .set("prove_4",commercialVo.getProve4())
+                .set("prove_5",commercialVo.getProve5())
+                .set("addr_code",commercialVo.getAddrCode())
+                .set("addr_code_info",initMapUtil.getInitAddrCodeMap(commercialVo.getAddrCode()))
+                .set("addr_info",commercialVo.getAddrInfo());
+            commercialMapper.update(null,updateWrapper);
+
+            //3.修改冗余字段中的商户名字
+            if (!commercialVo.getCommercialName().equals(commercial.getCommercialName())){
+                UpdateWrapper<App> updateWrapper1 = new UpdateWrapper<>();
+                updateWrapper1.eq("commercial_id",commercialVo.getCommercialId())
+                    .set("commercial_name",commercialVo.getCommercialName());
+                appMapper.update(null,updateWrapper1);
+
+                UpdateWrapper<Plan> updateWrapper2 = new UpdateWrapper<>();
+                updateWrapper2.eq("commercial_id",commercialVo.getCommercialId())
+                    .set("commercial_name",commercialVo.getCommercialName());
+                planMapper.update(null,updateWrapper2);
+            }
+            return R.ok("修改成功");
+        }else {
+            return R.fail("不存在该小程序");
+        }
     }
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.demo.entity.*;
 import com.ruoyi.demo.entity.bo.EquipmentBo;
 import com.ruoyi.demo.entity.bo.PlanBo;
@@ -82,78 +83,79 @@ public class EquipmentServiceImpl implements EquipmentService {
     }
 
     @Override
-    public void updateEquipment(EquipmentVo equipmentVo) {
-        //1.更新地区码映射
-        equipmentVo.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipmentVo.getAddrCode()));
-        //2.更新时间
-        equipmentVo.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
-        UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
-        updateWrapper.set("equipment_name",equipmentVo.getEquipmentName())
-            .set("equipment_code",equipmentVo.getEquipmentCode())
-            .set("annotation",equipmentVo.getAnnotation())
-            .set("addr_info",equipmentVo.getAddrInfo())
-            .set("addr_code",equipmentVo.getAddrCode())
-            .set("addr_code_info",equipmentVo.getAddrCode())
-            .set("state",equipmentVo.getState())
-            .set("lat",equipmentVo.getLat())
-            .set("lng",equipmentVo.getLng())
-            .set("manufacturers",equipmentVo.getManufacturers())
-            .set("maintain_name",equipmentVo.getMaintainName())
-            .set("maintain_telephone",equipmentVo.getMaintainTelephone())
-            .set("update_time",equipmentVo.getUpdateTime());
-        equipmentMapper.update(null,updateWrapper);
+    public R updateEquipment(EquipmentVo equipmentVo) {
+        QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("equipment_name","addr_info","addr_code","addr_code_info");
+        queryWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
+        Equipment equipment = equipmentMapper.selectOne(queryWrapper);
 
-        //修改冗余字段
-        CompletableFuture<Void> future1 = CompletableFuture.runAsync(()->{
-            UpdateWrapper<PlanItem> updateWrapper1 = new UpdateWrapper<>();
-            updateWrapper1.eq("equipment_id",equipmentVo.getEquipmentId());
-            updateWrapper1.set("equipment_name",equipmentVo.getEquipmentName())
+        if (equipment != null){
+            if (equipmentVo.getAddrCode().equals(equipment.getAddrCode()))
+                equipmentVo.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipmentVo.getAddrCode()));  //更新地区码映射
+
+            //2.更新时间
+            equipmentVo.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
+            updateWrapper.set("equipment_name",equipmentVo.getEquipmentName())
                 .set("equipment_code",equipmentVo.getEquipmentCode())
+                .set("annotation",equipmentVo.getAnnotation())
                 .set("addr_info",equipmentVo.getAddrInfo())
                 .set("addr_code",equipmentVo.getAddrCode())
-                .set("addr_code_info",equipmentVo.getAddrCode());
-            planItemMapper.update(null,updateWrapper1);
-        });
-
-
-        CompletableFuture<Void> future2 = CompletableFuture.runAsync(()->{
-            UpdateWrapper<Statistics> updateWrapper2 = new UpdateWrapper<>();
-            updateWrapper2.eq("equipment_id",equipmentVo.getEquipmentId());
-            updateWrapper2.set("equipment_name",equipmentVo.getEquipmentName())
-                .set("equipment_code",equipmentVo.getEquipmentCode());
-            statisticsMapper.update(null,updateWrapper2);
-        });
-
-
-
-        CompletableFuture<Void> future3 = CompletableFuture.runAsync(()->{
-            UpdateWrapper<DlUser> updateWrapper3 = new UpdateWrapper<>();
-            updateWrapper3.eq("start_equipment_id",equipmentVo.getEquipmentId());
-            updateWrapper3.set("start_equipment_name",equipmentVo.getEquipmentName())
-                .set("start_equipment_code",equipmentVo.getEquipmentCode());
-            dlUserMapper.update(null,updateWrapper3);
-        });
-
+                .set("addr_code_info",equipmentVo.getAddrCode())
+                .set("state",equipmentVo.getState())
+                .set("lat",equipmentVo.getLat())
+                .set("lng",equipmentVo.getLng())
+                .set("manufacturers",equipmentVo.getManufacturers())
+                .set("maintain_name",equipmentVo.getMaintainName())
+                .set("maintain_telephone",equipmentVo.getMaintainTelephone())
+                .set("update_time",equipmentVo.getUpdateTime());
+            equipmentMapper.update(null,updateWrapper);
+
+            //修改冗余字段
+            if (!equipment.getEquipmentName().equals(equipmentVo.getEquipmentName()) || !equipment.getEquipmentCode().equals(equipmentVo.getEquipmentCode()) || !equipment.getAddrCode().equals(equipmentVo.getAddrCode()) || !equipment.getAddrCodeInfo().equals(equipmentVo.getAddrCodeInfo())){
+                UpdateWrapper<PlanItem> updateWrapper1 = new UpdateWrapper<>();
+                updateWrapper1.eq("equipment_id",equipmentVo.getEquipmentId());
+                updateWrapper1.set("equipment_name",equipmentVo.getEquipmentName())
+                    .set("equipment_code",equipmentVo.getEquipmentCode())
+                    .set("addr_info",equipmentVo.getAddrInfo())
+                    .set("addr_code",equipmentVo.getAddrCode())
+                    .set("addr_code_info",equipmentVo.getAddrCode());
+                planItemMapper.update(null,updateWrapper1);
+            }
 
-        CompletableFuture<Void> future4 = CompletableFuture.runAsync(()->{
-            UpdateWrapper<DlUser> updateWrapper4 = new UpdateWrapper<>();
-            updateWrapper4.eq("end_equipment_id",equipmentVo.getEquipmentId());
-            updateWrapper4.set("end_equipment_name",equipmentVo.getEquipmentName())
-                .set("end_equipment_code",equipmentVo.getEquipmentCode());
-            dlUserMapper.update(null,updateWrapper4);
-        });
 
+            if (!equipment.getEquipmentName().equals(equipmentVo.getEquipmentName()) || !equipment.getEquipmentCode().equals(equipmentVo.getEquipmentCode())){
+                UpdateWrapper<Statistics> updateWrapper2 = new UpdateWrapper<>();
+                updateWrapper2.eq("equipment_id",equipmentVo.getEquipmentId());
+                updateWrapper2.set("equipment_name",equipmentVo.getEquipmentName())
+                    .set("equipment_code",equipmentVo.getEquipmentCode());
+                statisticsMapper.update(null,updateWrapper2);
+
+                UpdateWrapper<DlUser> updateWrapper3 = new UpdateWrapper<>();
+                updateWrapper3.eq("start_equipment_id",equipmentVo.getEquipmentId());
+                updateWrapper3.set("start_equipment_name",equipmentVo.getEquipmentName())
+                    .set("start_equipment_code",equipmentVo.getEquipmentCode());
+                dlUserMapper.update(null,updateWrapper3);
+
+                UpdateWrapper<DlUser> updateWrapper4 = new UpdateWrapper<>();
+                updateWrapper4.eq("end_equipment_id",equipmentVo.getEquipmentId());
+                updateWrapper4.set("end_equipment_name",equipmentVo.getEquipmentName())
+                    .set("end_equipment_code",equipmentVo.getEquipmentCode());
+                dlUserMapper.update(null,updateWrapper4);
+
+                UpdateWrapper<PlanPushStatistics> updateWrapper5 = new UpdateWrapper<>();
+                updateWrapper5.eq("equipment_id",equipmentVo.getEquipmentId());
+                updateWrapper5.set("equipment_name",equipmentVo.getEquipmentName())
+                    .set("equipment_code",equipmentVo.getEquipmentCode());
+                planPushStatisticsMapper.update(null,updateWrapper5);
+            }
+            return R.ok("修改成功");
+        }else {
+            return R.fail("设备不存在");
+        }
 
-        CompletableFuture<Void> future5 = CompletableFuture.runAsync(()->{
-            UpdateWrapper<PlanPushStatistics> updateWrapper5 = new UpdateWrapper<>();
-            updateWrapper5.eq("equipment_id",equipmentVo.getEquipmentId());
-            updateWrapper5.set("equipment_name",equipmentVo.getEquipmentName())
-                .set("equipment_code",equipmentVo.getEquipmentCode());
-            planPushStatisticsMapper.update(null,updateWrapper5);
-        });
 
-        CompletableFuture.allOf(future1,future2,future3,future4,future5);
     }
 
     @Override